diff --git a/.gitignore b/.gitignore
index dbf12e1..a6c7a93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,10 @@
app/build
.gradle
-gradle/
+gradle/*
+!gradle/wrapper/gradle-wrapper.jar
+!gradle/wrapper/gradle-wrapper.properties
*.iml
.idea
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/datasources.xml
-.idea/dataSources.ids
*.swp
local.properties
.DS_Store
@@ -20,3 +18,4 @@ out/
*.jks
*.keystore
signing.properties
+
diff --git a/app/build.gradle b/app/build.gradle
index 0afacbb..6ef5b43 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,18 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 28
- buildToolsVersion "28.0.3"
+ defaultConfig {
+ versionCode 2
+ versionName "1.2"
+ }
+ compileSdkVersion 30
+ buildToolsVersion "30.0.0"
defaultConfig {
applicationId "com.pitchgauge.j9pr.pitchgauge"
minSdkVersion 21
- targetSdkVersion 28
+ targetSdkVersion 30
versionCode 2
- versionName "1.1"
+ versionName "1.2"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/colorschememapping.xml b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/colorschememapping.xml
new file mode 100644
index 0000000..6a0069c
--- /dev/null
+++ b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/colorschememapping.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/filelist.xml b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/filelist.xml
index 84d91bb..c9b6d04 100644
--- a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/filelist.xml
+++ b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/filelist.xml
@@ -1,27 +1,34 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
-
-
+
+
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image001.jpg b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image001.jpg
deleted file mode 100644
index 74a2304..0000000
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image001.jpg and /dev/null differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image001.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image001.png
new file mode 100644
index 0000000..05899a6
Binary files /dev/null and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image001.png differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image002.jpg b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image002.jpg
new file mode 100644
index 0000000..e0a51ad
Binary files /dev/null and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image002.jpg differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image002.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image002.png
deleted file mode 100644
index d9bbdb5..0000000
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image002.png and /dev/null differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image003.jpg b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image003.jpg
new file mode 100644
index 0000000..104599b
Binary files /dev/null and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image003.jpg differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image003.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image003.png
deleted file mode 100644
index 683dd63..0000000
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image003.png and /dev/null differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image004.jpg b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image004.jpg
new file mode 100644
index 0000000..6033e5a
Binary files /dev/null and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image004.jpg differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image004.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image004.png
deleted file mode 100644
index 4899f92..0000000
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image004.png and /dev/null differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image005.jpg b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image005.jpg
index aca5043..5b27d54 100644
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image005.jpg and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image005.jpg differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image006.jpg b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image006.jpg
new file mode 100644
index 0000000..9edae24
Binary files /dev/null and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image006.jpg differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image006.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image006.png
deleted file mode 100644
index a7d0698..0000000
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image006.png and /dev/null differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image007.jpg b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image007.jpg
deleted file mode 100644
index efb6e96..0000000
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image007.jpg and /dev/null differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image007.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image007.png
new file mode 100644
index 0000000..f6ea42b
Binary files /dev/null and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image007.png differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image008.jpg b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image008.jpg
new file mode 100644
index 0000000..e14b2d6
Binary files /dev/null and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image008.jpg differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image008.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image008.png
deleted file mode 100644
index 9c9c09a..0000000
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image008.png and /dev/null differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image009.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image009.png
index af1754c..a1abba3 100644
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image009.png and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image009.png differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image010.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image010.png
index 9d54b19..3cc2eb6 100644
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image010.png and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image010.png differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image011.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image011.png
index 51cab28..ffb0a08 100644
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image011.png and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image011.png differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image012.jpg b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image012.jpg
new file mode 100644
index 0000000..c2bf560
Binary files /dev/null and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image012.jpg differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image012.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image012.png
deleted file mode 100644
index d794beb..0000000
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image012.png and /dev/null differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image013.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image013.png
deleted file mode 100644
index 90a5ed0..0000000
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image013.png and /dev/null differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image014.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image014.png
deleted file mode 100644
index 4c86493..0000000
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image014.png and /dev/null differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image015.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image015.png
index 2a6eb59..d30c1ef 100644
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image015.png and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image015.png differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image016.jpg b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image016.jpg
new file mode 100644
index 0000000..44d430f
Binary files /dev/null and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image016.jpg differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image016.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image016.png
deleted file mode 100644
index 83efd90..0000000
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image016.png and /dev/null differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image017.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image017.png
index e113343..b75e626 100644
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image017.png and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image017.png differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image018.jpg b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image018.jpg
new file mode 100644
index 0000000..97fc439
Binary files /dev/null and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image018.jpg differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image018.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image018.png
deleted file mode 100644
index d9bba2d..0000000
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image018.png and /dev/null differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image019.jpg b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image019.jpg
new file mode 100644
index 0000000..7460dd4
Binary files /dev/null and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image019.jpg differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image019.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image019.png
deleted file mode 100644
index 03aa15d..0000000
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image019.png and /dev/null differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image020.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image020.png
index 313a57a..47529f1 100644
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image020.png and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image020.png differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image021.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image021.png
index 8b05984..72d622a 100644
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image021.png and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image021.png differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image022.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image022.png
deleted file mode 100644
index 997a89c..0000000
Binary files a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image022.png and /dev/null differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image024.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image024.png
new file mode 100644
index 0000000..0eaffa7
Binary files /dev/null and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image024.png differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image025.jpg b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image025.jpg
new file mode 100644
index 0000000..f46d11d
Binary files /dev/null and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image025.jpg differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image026.jpg b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image026.jpg
new file mode 100644
index 0000000..4cdbf4c
Binary files /dev/null and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image026.jpg differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image027.jpg b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image027.jpg
new file mode 100644
index 0000000..5dd0e91
Binary files /dev/null and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image027.jpg differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image028.jpg b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image028.jpg
new file mode 100644
index 0000000..e898853
Binary files /dev/null and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image028.jpg differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image038.jpg b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image038.jpg
new file mode 100644
index 0000000..8ef9c09
Binary files /dev/null and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image038.jpg differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image039.jpg b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image039.jpg
new file mode 100644
index 0000000..ceca0de
Binary files /dev/null and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image039.jpg differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image042.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image042.png
new file mode 100644
index 0000000..a00f4f1
Binary files /dev/null and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image042.png differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image044.png b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image044.png
new file mode 100644
index 0000000..a493d18
Binary files /dev/null and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/image044.png differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/themedata.thmx b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/themedata.thmx
new file mode 100644
index 0000000..c2dd8c1
Binary files /dev/null and b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/themedata.thmx differ
diff --git a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0.htm b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0.htm
index 3dfdcb9..7c35828 100644
--- a/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0.htm
+++ b/app/src/main/assets/Make-your-own-BlueTooth-RC-Throwmeter-V2.0.htm
@@ -2,13 +2,13 @@
xmlns:o="urn:schemas-microsoft-com:office:office"
xmlns:w="urn:schemas-microsoft-com:office:word"
xmlns:m="http://schemas.microsoft.com/office/2004/12/omml"
-xmlns:mv="http://macVmlSchemaUri" xmlns="http://www.w3.org/TR/REC-html40">
+xmlns="http://www.w3.org/TR/REC-html40" xmlns:ns0="http://macVmlSchemaUri">
-
+
-
-
+
+
+href="Make-your-own-BlueTooth-RC-Throwmeter-V2.0-Dateien/themedata.thmx">
+
@@ -967,18 +1364,16 @@
-
+
-
+
+
Make your own BlueTooth RC Throwmeter
-
-
by Yannick Selles, Pierre
-Rondel, Vitaliy Ryumshyn
-
-
Make your own Bluetooth RC Throwmeter
+
+
+FR'>by Yannick Selles, Pierre Rondel, Vitaliy Ryumshyn and Alois Hahn
+
+
Introduction
-
This mobile application allows you to
"build" your own Bluetooth throw-meter for a very reasonable cost. It
doesn't require any soldering or cabling. You just need to have access to a 3D
printer and that is all!
-
-
What is new in this version?
+
What is new in
+this version?
-
-
+mso-fareast-language:FR'>Support to sensors
-simultaneously
-
-
+font-family:"Times New Roman",serif;mso-fareast-font-family:"Times New Roman";
+color:black;mso-ansi-language:EN-US;mso-fareast-language:FR'>Support two
+sensors simultaneously
+
+
More stable Bluetooth
-connection, and reconnection when exiting of standby/sleeping mode
-
-
+font-family:"Times New Roman",serif;mso-fareast-font-family:"Times New Roman";
+color:black;mso-ansi-language:EN-US;mso-fareast-language:FR'>Calibration
+support
+
+
Bluetooth status
+bar
+
+
+More stable
+Bluetooth connection, and reconnection when exiting of standby/sleeping mode
+
+
+Clearer separation
between max travel feature and limit setting with alarm feature
-
+
Localization
-
+
+German language
+support
+
+
The component
-
-
The component is the BWT61CL from Wit Motion, a six
-axis Bluetooth attitude angle sensor with battery incorporated. You can buy it
-on AliExpress or Amazon US and amazon EU and cost
-around 20~25 Euros, free shipping.
+mso-fareast-language:FR'>The component is the BWT61CL from WitMotion, a
+six axis Bluetooth attitude angle sensor with battery incorporated. You can buy
+it on AliExpress or Amazon US and amazon EU and cost around 20~25 Euros, free
+shipping.
-
-
It is based on the JY61 sensor, has Bluetooth or
serial connectivity, integrates a dynamic Kalman filter algorithm, an internal
-voltage stabilizing circuit module, voltage 3.3v~5v. The only drawback it has
-is that the Bluetooth BLE is only compatible with android. The battery has a
-150mA capacity so last for a long operation time.
+voltage stabilizing circuit module, voltage 3.3v~5v. The only drawback is, that
+the Bluetooth BLE is only compatible with android. The battery has a 150mA
+capacity so it lasts for a long operation time.
As I said in introduction, the work is limited to the
-3D printing of the clips that allow to fix the device on the trailing edge of
-the glider. It has been designed on DesignSpark (original
-file .rsdoc), and I'm providing the .rsdoc original file in addition to the STL file.
-
-
As said in the introduction, the work is limited to
+the 3D printing of the clips that allow to fix the device on the trailing edge
+of the glider. It has been designed on DesignSpark (original file .rsdoc), and I'm
+providing the .rsdoc original file in addition to the STL file.
The clips is removable so the device, its clips and
+mso-fareast-language:FR'>The clips are removable, so the device, its clips and
the charging cable can be carried/stored in the plastic box it was received in.
-
-
Just print the part, in PLA or PETG or ABS, 100% in
-fill for me. The dimension is optimised for F3x plane wings and tailplanes. To
+mso-fareast-language:FR'>Just print the part, in PLA or PETG or ABS, 100% infill
+for me. The dimension is optimised for F3x plane wings and tailplanes. To
protect the surface of the control surface and avoid the clips to slide/shift,
I added a piece of rubber (a small piece of bicycle inner tube) on the clips
surfaces, with double side tape.
-
-
-
+
-
+
-
Print the sticker using the .pdf provided. Prior to
apply it, don't forget to remove the other stiker. Protect the printed
@@ -1399,371 +1785,443 @@
(Charge, On/Off). This will give you the orientation when using pointing where
is the hinge
-
The App
-
The Android App has been developped
-by Yannick and Vitaliy. The App is divided in several
-screens, the start screen giving access to the top left menu, the "Sensor
-BT" screen to bind the App with the throwmeter, and finally the
-"Throw Meter" screen where everything happens once binded.
-
-
The Android App has been developed by Yannick and
+Vitaliy. The App is divided in several screens, the start screen giving access
+to the top left menu, the "Sensor BT" screen to bind the App with the
+throwmeter, and finally the "Throw Meter" screen where everything
+happens once binded.
+
+
Using your RC
Throw-meter(s)
Charging the
battery
-
Connect the cable provided to the balancer Plug. The
-red led is ON during the charge and switch off once charged
+mso-fareast-language:FR'>Connect the cable provided to the balancer Plug. On
+newer versions just connect the USB cable. The red LED is ON during the charge
+and switches to OFF once charged.
-
Switching on your Throwmeter(s)
+13.5pt;font-family:"Times New Roman",serif;mso-fareast-font-family:"Times New Roman";
+color:black;mso-ansi-language:EN-US;mso-fareast-language:FR'>Switching on your
+Throwmeter(s)
-
Move the sliding switch from right to left. The blue
-led is blinking which indicates that the device is waiting for the binding.
+mso-fareast-language:FR'>Move the sliding switch from right to left. The blue LED
+is blinking which indicates that the device is waiting for the binding.
-
Binding your
Android smartphone for the first time
-
On in the parameter/bluetooth menu and scan for new
-device. The BWT61CL will show as HC-06. When asked, enter the code 1234. The sensor
-is now binded, you can open the App.
+mso-fareast-language:FR'>On your smartphone navigate to the parameter/bluetooth
+menu and scan for new devices. The BWT61CL will show as HC-06. When asked,
+enter the code 1234. The sensor is now binded and you are ready to open the
+App.
-
Binding with the
App
-
Select the menu on
-the top left, then open "Sensor BT" and select one (or two) HC-06 sensors
-or click on SCAN if the device doesn't appear. Once selected you can return on
-the start page, Open the menu on the top left and select "Throw
-meter"
-
-
-
-
+
Select the menu on the top left, then open
+"Sensor BT" and select one (or two) HC-06 sensors or click on SCAN if
+the device doesn't appear. Once selected you can return on the start page. Open
+the menu on the top left and select "Throw meter"
+
+
+
+
+
+
+
+
-
+
-
Very first
-calibration
+
Calibration
-
+
If the device is providing inconsistent or weird measures, it probably
-needs a full calibration using the manufacturer App you can download here. To do so, once selected the correct
-chipset model WT601, click on SET (top left) and then "Acceleration
-calibration".
+font-family:"Times New Roman",serif;color:#222222;background:white;mso-ansi-language:
+EN-US'>If the device is providing inconsistent or weird measures, it probably needs
+a full calibration. Level the sensor(s) horizontally and do not move. Press
+Calibrate and wait until calibration completes.
+
+
+
+
-
+ o:title=""/>
+
+
+
-
+
Reset Angle
-
You can now leave this
-App and start the RC Throw-meter Application.
-
-The device is supposed to do a calibration at startup.
+It is recommended to do it with the device installed on a horizontal surface.
+Once done, you can clip the device on the leading edge of control
+surface you want to measure. When your control surface is at its neutral
+position, proceed to a new "Reset Angle" in order for the device
+to know its spacial position and be ready to measure the angle.
+
+
+
+
-
Reset Angle
-
-
The device is
-supposed to do a calibration at startup. It is recommended to do it with the
-device installed on a horizontal surface. Once done, you can clip the
-device on the leading edge of control surface you want to measure. When
-your control surface is at its neutral position, proceed to a new
-"Reset Angle" in order for the device to know its spacial position
-and be ready to measure the angle.
-
-
Travel setup
-
Measure the chord
-of you control surface and click on the chord field at the top of the screen to
-enter the value. There is no unit so it can be mm or inches. Travel will be
-shown in the same unit.
-
-
-
-
+ o:title=""/>
+
+
+
Max UP and Max
DOWN
-
This is a very useful feature that allows you to
quickly measure the Max UP and DOWN travels of a control surface.
-
-
-
-
+
+
SET Max UP and Max
-DOWN
+13.5pt;font-family:"Times New Roman",serif;mso-fareast-font-family:"Times New Roman";
+color:black;mso-ansi-language:EN-US;mso-fareast-language:FR'>Set Max UP and Max
+DOWN Thresholds
-
If your objective is to do the settings, not to
-measure, you can enter the Max UP and Down values separately to indicate to the
-App to display an alarm (Red color) when the max value is exceeded.
+measure, you can enter the Max UP and DOWN threshold values separately. This instructs
+the App to display an alarm (RED color) when the threshold values are exceeded.
-
-
-
-
-
-
+
+
When the travel value exceed the max Value set, the corresponding
-line is going RED, but will continue to record the max value, even if it is
-above the limite. So you need to reset time to time to erase the max travel
-recorded and check your setting.
-
-
-
-
-
-
+ o:title=""/>
+
-
+
+
When the travel value exceeds the max Value set, the
+corresponding line is going RED, but will continue to record the max value,
+even if it is above the limit. So you need to reset it from time-to-time to
+erase the max travel recorded and check your setting.
+
+
+
+
+FR;mso-no-proof:yes'>
+
+
+
+
+
+
Calibration with
+the manufacturer App
+
+
+
+
Alternatively, instead using the Calibrate Button as described above,
+the calibration can be done with the manufacturer App as well. You can
+download the manufacturer App here. To do a full calibration, once selected
+the correct chipset model WT601, click on SET (top left) and then
+"Acceleration calibration".
+
+
+
+
+
+
+
+
You can now leave this
+App and start the RC Throw-meter Application.
+
+
+
+
+
+
-
Hope you will enjoy this Bluetooth RC Throw-meter and
-this new App version !
+this new App version !
diff --git a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothBaseActivity.java b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothBaseActivity.java
index 19b1ff4..93eab05 100644
--- a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothBaseActivity.java
+++ b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothBaseActivity.java
@@ -35,7 +35,8 @@ public class BluetoothBaseActivity extends AppCompatActivity {
protected Handler mHandler ;
protected boolean mIsBound;
protected BluetoothPipe mBluetoothPipe;
- protected ArrayList mDeviceTags = new ArrayList<>();;
+ protected ArrayList mDeviceTags = new ArrayList<>();
+
protected boolean autoStart;
protected ServiceConnection serviceConnection = new ServiceConnection() {
@@ -136,7 +137,7 @@ else if(state == BluetoothState.STATE_NONE)
mBluetoothPipe.setOnDataReceivedListener(new BluetoothPipe.OnDataReceivedListener() {
public void onDataReceived(byte[] data, String message) {
- Log.d(TAG, "Record Message: "+ message + "\n");
+ Log.d(TAG, "Record Message: " + message + "\n");
}
});
@@ -147,7 +148,7 @@ public void onDeviceConnected(DeviceTag deviceTag) {
mDeviceTags.add(deviceTag);
Toast.makeText(getApplicationContext()
- , "Connected " + deviceTag.getName()+ " (" +(deviceTag.getPos()+1)+")"
+ , "Connected " + deviceTag.getName() + " (" + (deviceTag.getPos() + 1) + ")"
, Toast.LENGTH_SHORT).show();
SerialPortOpen();
@@ -238,7 +239,7 @@ private void connectDevicesFromKeyring() {
mDeviceTags = devices;
connectDevicesTags();
} else {
- //TODO
+ //TODO AHa: no action, only message displayed
Log.d(TAG, "no saved devices found. goto selection activity");
}
}
diff --git a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothPipe.java b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothPipe.java
index 6c1cc27..d2874f9 100644
--- a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothPipe.java
+++ b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothPipe.java
@@ -111,15 +111,17 @@ public void stopService() {
if (mBluetoothService != null) {
isServiceRunning = false;
mBluetoothService.stop();
+ mBluetoothService = null; // AHa: I guess, mBluetoothService is not set to null on destroy?
}
- new Handler().postDelayed(new Runnable() {
- public void run() {
- if (mBluetoothService != null) {
- isServiceRunning = false;
- mBluetoothService.stop();
- }
- }
- }, 500);
+ // TODO AHa: check, is not needed
+// new Handler().postDelayed(new Runnable() {
+// public void run() {
+// if (mBluetoothService != null) {
+// isServiceRunning = false;
+// mBluetoothService.stop();
+// }
+// }
+// }, 1000);
}
public void disconnect() {
diff --git a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothPreferences.java b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothPreferences.java
index 5eed6f7..31c2c0f 100644
--- a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothPreferences.java
+++ b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothPreferences.java
@@ -14,9 +14,18 @@
public class BluetoothPreferences {
-
public static final String LIST_INFO = "list_info";
+ // fetch tag from list of tags
+ public static DeviceTag getTag(int inhash, ArrayList l) {
+ DeviceTag result = new DeviceTag();
+ for (DeviceTag sTag: l) {
+ if (sTag.hashCode() == inhash) {
+ return sTag;
+ }
+ }
+ return new DeviceTag();
+ }
public static void setKeyrings(Context context, ArrayList arrPackage) {
final SharedPreferences defaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext());
diff --git a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothService.java b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothService.java
index 979969c..7459df3 100644
--- a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothService.java
+++ b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothService.java
@@ -19,6 +19,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
+import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Queue;
@@ -56,6 +57,8 @@ public class BluetoothService extends Service {
private List mDeviceAddresses;
private List mDeviceNames;
private List mConnThreads;
+ private static ArrayList activeConnectedThreads=new ArrayList();
+
private List mSockets;
private List mfDatas;
private List> mQueueBuffers;
@@ -105,7 +108,6 @@ public int onStartCommand(Intent intent, int flags, int startId) {
@Override
public void onDestroy() {
- this.stop();
super.onDestroy();
}
@@ -172,12 +174,14 @@ public void run() {
}
public void cancel() {
- try {
- this.mmServerSocket.close();
- mmServerSocket = null;
+ if (mmServerSocket != null) {
+ try {
+ this.mmServerSocket.close();
+ mmServerSocket = null;
- } catch (IOException e) {
- }
+ } catch (IOException e) {
+ }
+ }
}
public void kill() {
@@ -203,7 +207,7 @@ public ConnectThread(BluetoothDevice device, UUID uuid, int pos) {
}
public void run() {
- setName("ConnectThread");
+ setName("ConnectThread" + position);
//mAdapter.cancelDiscovery();
try {
@@ -243,9 +247,13 @@ class ConnectedThread extends Thread {
private final InputStream mmInStream;
private final OutputStream mmOutStream;
private final BluetoothSocket mmSocket;
+ private boolean isRunningConnectedThread = true;
+ private int position;
- public ConnectedThread(BluetoothSocket socket) {
+ public ConnectedThread(BluetoothSocket socket, int pos) {
+ activeConnectedThreads.add(this);
this.mmSocket = socket;
+ this.position = pos;
InputStream tmpIn = null;
OutputStream tmpOut = null;
try {
@@ -259,7 +267,9 @@ public ConnectedThread(BluetoothSocket socket) {
public void run() {
byte[] tempInputBuffer = new byte[1024];
- while (true) {
+ setName("ConnectedThread" + position);
+
+ while (isRunningConnectedThread) {
try {
int acceptedLen = this.mmInStream.read(tempInputBuffer);
if (acceptedLen > 0) {
@@ -275,6 +285,10 @@ public void run() {
return;
}
}
+ try {
+ this.mmSocket.close();
+ } catch (IOException e) {
+ }
}
public void write(byte[] buffer) {
@@ -286,10 +300,7 @@ public void write(byte[] buffer) {
}
public void cancel() {
- try {
- this.mmSocket.close();
- } catch (IOException e) {
- }
+ isRunningConnectedThread = false;
}
}
@@ -399,7 +410,7 @@ public synchronized void connect(BluetoothDevice device, int pos) {
if (getPosIndexOfDevice(device) == -1) {
- Log.d(TAG, "connect to: " + device.getName()+ " Address: " + device.getAddress());
+ Log.d(TAG, "BluetoothService connect(): connect to: " + device.getName() + " Address: " + device.getAddress());
if (isDeviceConnectedAtPos(pos) && mState == BluetoothState.STATE_CONNECTED) {
Log.d(TAG, "Already connected to: " + device.getName()+ " Address: " + device.getAddress()+ " ignore");
@@ -426,7 +437,7 @@ public synchronized void connect(BluetoothDevice device, int pos) {
uuid = device.getUuids()[0].getUuid();
}
- Log.d(TAG, "device UUID===" + uuid);
+ Log.d(TAG, "BluetoothService connect(): Connect device UUID===" + uuid);
ConnectThread mConnectThread = new ConnectThread(device, uuid, pos);
mConnectThread.start();
@@ -450,12 +461,14 @@ public synchronized void connected(BluetoothSocket socket, BluetoothDevice devic
this.mConnectThread.cancel();
this.mConnectThread = null;
}
+
+ // TODO AHa: why kill mAcceptThread so early, exit from blocking accept()
if (this.mAcceptThread != null) {
this.mAcceptThread.cancel();
this.mAcceptThread.kill();
this.mAcceptThread = null;
}
- this.mConnectedThread = new ConnectedThread(socket);
+ this.mConnectedThread = new ConnectedThread(socket, pos);
mConnThreads.set(pos, mConnectedThread);
this.mConnectedThread.start();
@@ -471,23 +484,27 @@ public synchronized void connected(BluetoothSocket socket, BluetoothDevice devic
}
private void stopping() {
- if (this.mConnectedThread != null) {
- this.mConnectedThread.cancel();
- this.mConnectedThread = null;
+
+ // stop all ConnectedThreads
+ Iterator itr = activeConnectedThreads.iterator();
+ while (itr.hasNext()) {
+ ConnectedThread t = itr.next();
+ if (t.isAlive()) {
+ t.cancel();
+ Log.d(TAG, "BTService.stopped() id=" + t.getId() + " t=" + t.toString());
+ }
+ itr.remove();
}
+
if (this.mAcceptThread != null) {
this.mAcceptThread.cancel();
this.mAcceptThread = null;
}
+
for (int i = 0; i < MAX_SENSOR_COUNT; i++) {
mDeviceNames.set(i, null);
mDeviceAddresses.set(i, null);
mSockets.set(i, null);
-
- if (mConnThreads.get(i) != null) {
- mConnThreads.get(i).cancel();
- mConnThreads.set(i, null);
- }
}
if (mAdapter != null){
@@ -540,6 +557,7 @@ private void connectionLost(BluetoothDevice device) {
mHandler.sendMessage(msg);
}
+ // TODO AHa: restart not working as expected, connectionLost is called on destroy/stop also
BluetoothService.this.start();
}
diff --git a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothState.java b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothState.java
index 8e9ff4b..3e014d7 100644
--- a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothState.java
+++ b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothState.java
@@ -14,4 +14,8 @@ public class BluetoothState {
public static final int MESSAGE_DEVICE_NAME = 4;
public static final int MESSAGE_TOAST = 5;
+ // status of data reception from WIT
+ public static final int WIT_IDLE = 0;
+ public static final int WIT_DATA_ARRIVING = 1;
+
}
diff --git a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/DeviceListActivity.java b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/DeviceListActivity.java
index 6bc2b0c..7bd9fbb 100644
--- a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/DeviceListActivity.java
+++ b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/DeviceListActivity.java
@@ -84,24 +84,37 @@ public void onClick(View v) {
SparseBooleanArray sparseBooleanArray = pairedListView.getCheckedItemPositions();
- ArrayList tags = new ArrayList<>();
+ // get the saved tags
+ ArrayList savedTags = BluetoothPreferences.getKeyrings(getApplicationContext());
+
+ ArrayList stags = new ArrayList<>();
int pos = 0;
for (int i = 0; i < cntChoice; i++) {
if (sparseBooleanArray.get(i)) {
- DeviceTag tag = (DeviceTag) pairedListView.getItemAtPosition(i);
- tag.setPos(pos);
- tags.add(tag);
+ DeviceTag stag = new DeviceTag();
+ DeviceTag tagSelected = (DeviceTag) pairedListView.getItemAtPosition(i);
+ if (BluetoothPreferences.getTag(tagSelected.hashCode(), savedTags).hashCode() != 31 ) {
+ // in saved list
+ stag = BluetoothPreferences.getTag(tagSelected.hashCode(), savedTags);
+ stag.setAddress(tagSelected.getAddress());
+ stag.setName(tagSelected.getName());
+ } else {
+ // not in saved list
+ stag = tagSelected;
+ }
+ stag.setPos(pos);
+ stags.add(stag);
pos++;
}
}
mBluetoothPipe.cancelDiscovery();
- BluetoothPreferences.setKeyrings(getApplicationContext(), tags);
+ BluetoothPreferences.setKeyrings(getApplicationContext(), stags);
- if (!tags.isEmpty()) {
+ if (!stags.isEmpty()) {
Intent intent = new Intent();
- intent.putParcelableArrayListExtra(DEVICE_BT, tags );
+ intent.putParcelableArrayListExtra(DEVICE_BT, stags );
setResult(RESULT_OK, intent);
finish();
@@ -172,12 +185,13 @@ protected void onCreate(Bundle savedInstanceState) {
ArrayList savedDevices = BluetoothPreferences.getKeyrings(getApplicationContext());
+ int idx = 0;
for (BluetoothDevice device : pairedDevices) {
boolean found = false;
for (DeviceTag sTag: savedDevices) {
if (sTag.getAddress().equalsIgnoreCase(device.getAddress())) {
this.mPairedDevicesArrayAdapter.add(sTag);
- pairedListView.setItemChecked(sTag.getPos(),true); //Don't make the same mistake I did by calling this function before setting the listview adapter.
+ pairedListView.setItemChecked(idx,true); //Don't make the same mistake I did by calling this function before setting the listview adapter.
found = true;
break;
}
@@ -188,6 +202,7 @@ protected void onCreate(Bundle savedInstanceState) {
tag.setAddress(device.getAddress());
this.mPairedDevicesArrayAdapter.add(tag);
}
+ idx++;
}
}
}
diff --git a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/DeviceTag.java b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/DeviceTag.java
index e579a27..744e66c 100644
--- a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/DeviceTag.java
+++ b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/DeviceTag.java
@@ -5,15 +5,20 @@
import java.util.Objects;
+
public class DeviceTag implements Parcelable {
String address;
String name;
int pos = -1;
+ // extra preferences, use strings as used in dialogs
+ String chord = "0.0";
+ String travelMax = "0.0";
+ String travelMin = "0.0";
+ String units = "mm";
public String getAddress() {
return address;
}
-
public void setAddress(String address) {
this.address = address;
}
@@ -21,7 +26,6 @@ public void setAddress(String address) {
public String getName() {
return name;
}
-
public void setName(String name) {
this.name = name;
}
@@ -29,11 +33,38 @@ public void setName(String name) {
public int getPos() {
return pos;
}
-
public void setPos(int pos) {
this.pos = pos;
}
+ public String getChord() {
+ return chord;
+ }
+ public void setChord(String chord) {
+ this.chord = chord;
+ }
+
+ public String getTravelMax() {
+ return travelMax;
+ }
+ public void setTravelMax(String travelMax) {
+ this.travelMax = travelMax;
+ }
+
+ public String getTravelMin() {
+ return travelMin;
+ }
+ public void setTravelMin(String travelMin) {
+ this.travelMin = travelMin;
+ }
+
+ public String getUnits() {
+ return units;
+ }
+ public void setUnits(String units) {
+ this.units = units;
+ }
+
@Override
public String toString() {
String p = (pos >=0)?" ("+ (pos+1)+")":"";
diff --git a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/MainActivity.java b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/MainActivity.java
index b20f20a..243fae5 100644
--- a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/MainActivity.java
+++ b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/MainActivity.java
@@ -96,8 +96,17 @@ public boolean onNavigationItemSelected(MenuItem item) {
Intent intent = new Intent(MainActivity.this, ThrowActivity.class);
if (this.devices != null) {
intent.putParcelableArrayListExtra(DEVICE_BT, this.devices );
+ startActivityForResult(intent, REQ_THROW_ACTIVITY);
+ } else {
+ ArrayList savedTags = BluetoothPreferences.getKeyrings(getApplicationContext());
+ if (!savedTags.isEmpty()) {
+ intent.putParcelableArrayListExtra(DEVICE_BT, savedTags );
+ startActivityForResult(intent, REQ_THROW_ACTIVITY);
+ } else {
+ intent.setClass(MainActivity.this, DeviceListActivity.class);
+ startActivityForResult(intent, REQ_DATA_ACTIVITY);
+ }
}
- startActivityForResult(intent, REQ_THROW_ACTIVITY);
} else if (id == R.id.nav_BT) {
Intent intent = new Intent(MainActivity.this, DeviceListActivity.class);
startActivityForResult(intent, REQ_DATA_ACTIVITY);
diff --git a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/ThrowActivity.java b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/ThrowActivity.java
index 8a281ac..f808d03 100644
--- a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/ThrowActivity.java
+++ b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/ThrowActivity.java
@@ -5,11 +5,14 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.ActivityInfo;
+import android.content.res.Resources;
import android.databinding.DataBindingUtil;
+import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.arch.lifecycle.Observer;
import android.os.Handler;
import android.os.Message;
+import android.support.v4.content.res.ResourcesCompat;
import android.support.v7.app.AlertDialog;
import android.support.annotation.Nullable;
import android.text.InputType;
@@ -19,6 +22,8 @@
import android.widget.Toast;
import com.pitchgauge.j9pr.pitchgauge.databinding.ThrowActivityBinding;
+import java.util.ArrayList;
+
import static com.pitchgauge.j9pr.pitchgauge.BluetoothPipe.REQUEST_CONNECT_DEVICE;
import static com.pitchgauge.j9pr.pitchgauge.BluetoothPipe.REQUEST_ENABLE_BT;
@@ -41,6 +46,16 @@ public class ThrowActivity extends BluetoothBaseActivity {
private boolean isOpen;
private EditText input;
+ private enum dialogType {
+ T_LIMIT, T_CHORD, T_CALIBRATE
+ }
+
+ ArrayList devicePrefs = new ArrayList();
+
+ private boolean busyReset = false;
+ private boolean busyCalibration = false;
+
+ private btStatusWatcherClass btWatcher = new btStatusWatcherClass();
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if(requestCode == REQUEST_CONNECT_DEVICE) {
@@ -53,7 +68,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
mBluetoothPipe.setupService(mBluetoothService, mHandler);
} else {
Toast.makeText(getApplicationContext()
- , getApplication().getString(R.string.warning_bluetooth_not_enabled)
+ , getApplication().getString(R.string.txt_warning_bluetooth_not_enabled)
, Toast.LENGTH_SHORT).show();
finish();
}
@@ -133,19 +148,40 @@ public void handleMessage(Message msg) {
switch (msg.what) {
case BluetoothState.MESSAGE_STATE_CHANGE:
if (ThrowActivity.this.mBluetoothPipe.isServiceAvailable()) {
+ Bundle command = msg.getData();
+ if (command.getString("Reset sensor") == "New neutral") {
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ ThrowActivity.this.busyReset = true;
+ byte[] ResetZaxis = {(byte) 0xFF, (byte) 0xAA, (byte) 0x52};
+ ThrowActivity.this.mBluetoothService.Send(ResetZaxis);
+ try { Thread.sleep(1000); } catch(InterruptedException e) { }
+ ThrowActivity.this.resetSensor();
+ while (!ThrowActivity.this.hasResumed()) ;
+ ThrowActivity.this.resetNeutral();
+ ThrowActivity.this.busyReset = false;
+ }
+ }).start();
- new Thread(new Runnable() {
- @Override
- public void run() {
- byte[] ResetZaxis = {(byte)0xFF, (byte)0xAA, (byte)0x52};
- ThrowActivity.this.mBluetoothService.Suspend(true);
- ThrowActivity.this.mBluetoothService.Send(ResetZaxis);
- ThrowActivity.this.resetSensor();
- ThrowActivity.this.mBluetoothService.Suspend(false);
- while(!ThrowActivity.this.hasResumed());
- ThrowActivity.this.resetNeutral();
+ }
+ if (command.getString("Reset sensor") == "Calibrate") {
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ ThrowActivity.this.busyCalibration = true;
+ byte[] CalibrationCmd = {(byte) 0xFF, (byte) 0xAA, (byte) 0x67};
+ ThrowActivity.this.mBluetoothService.Send(CalibrationCmd);
+ try { Thread.sleep(10000); } catch(InterruptedException e) { }
+ ThrowActivity.this.resetSensor();
+ try { Thread.sleep(1000); } catch(InterruptedException e) { }
+ ThrowActivity.this.resetSensor();
+ while (!ThrowActivity.this.hasResumed()) ;
+ ThrowActivity.this.resetNeutral();
+ ThrowActivity.this.busyCalibration = false;
}
- }).start();
+ }).start();
+ }
}
break;
default:
@@ -174,23 +210,40 @@ protected void onCreate(Bundle savedInstanceState) {
binding.setCommandthrowViewModel(mGaugeViewModel);
binding.setLifecycleOwner(this);
- Button minAlert = (Button)findViewById(R.id.buttonSetMinTravel);
- Button maxAlert = (Button)findViewById(R.id.buttonSetMaxTravel);
+ final Button minAlert = (Button)findViewById(R.id.buttonSetMinTravel);
+ final Button maxAlert = (Button)findViewById(R.id.buttonSetMaxTravel);
minAlert.setOnClickListener(new View.OnClickListener() {
public void onClick(View v)
{
- onOpenDialogThresholdAlert(0);
+ onOpenDialogThresholdAlert(dialogType.T_LIMIT,0);
}
});
- maxAlert.setOnClickListener(new View.OnClickListener() {
+ maxAlert.setOnClickListener(new View.OnClickListener() {
public void onClick(View v)
{
- onOpenDialogThresholdAlert(1);
+ onOpenDialogThresholdAlert(dialogType.T_LIMIT,1);
}
});
+ // chord button
+ final Button chordButton = findViewById(R.id.inChordButton);
+ chordButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ onOpenDialogThresholdAlert(dialogType.T_CHORD,0);
+ }
+ });
+
+ // calibration confirm box
+ final Button calibrateButton = (Button)findViewById(R.id.buttonCalibrate);
+ calibrateButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ onOpenDialogThresholdAlert(dialogType.T_CALIBRATE,0);
+ }
+ });
+
+
mGaugeViewModel.getThrowGauge().observe(this, new Observer() {
@Override
public void onChanged(@Nullable ThrowGauge user) {
@@ -213,6 +266,20 @@ public void onChanged(@Nullable ThrowGauge user) {
mHandler = new DataHandler();
+ // read preference
+ devicePrefs = BluetoothPreferences.getKeyrings(getApplicationContext());
+ for (int i = 0; i < devicePrefs.size(); i++) {
+ DeviceTag tag = devicePrefs.get(i);
+ if (tag.getChord() != "0.0") {
+ mGaugeViewModel.setChordValueDia(tag.getChord());
+ mGaugeViewModel.setMaxTravelDia(tag.getTravelMax());
+ mGaugeViewModel.setMaxTravelDia2(tag.getTravelMax());
+ mGaugeViewModel.setMinTravelDia(tag.getTravelMin());
+ mGaugeViewModel.setMinTravelDia2(tag.getTravelMin());
+ }
+ }
+ // watch BT activity and display status line
+ btWatcher.start();
}
public void resetNeutral(){
@@ -227,35 +294,72 @@ public boolean hasResumed(){
return mGaugeViewModel.HasResumed();
}
- private void onOpenDialogThresholdAlert(int lohi){
+ // dialog for MaxTravel, MinTravel and Chord
+ private void onOpenDialogThresholdAlert(final dialogType t, final int lohi) {
+
+ Resources res = getResources();
+ String strTitle = "";
+ String strValue = "";
+ switch (t) {
+ case T_LIMIT:
+ if (lohi == 0) {
+ strTitle = res.getString(R.string.txt_dlg_min_negative_travel);
+ strValue = mGaugeViewModel.getMinTravelSetNum();
+
+ } else {
+ strTitle = res.getString(R.string.txt_dlg_max_positive_travel);
+ strValue = mGaugeViewModel.getMaxTravelSetNum();
+ }
+ break;
+ case T_CHORD:
+ strTitle = res.getString(R.string.txt_chord);
+ strValue = mGaugeViewModel.getChordValueNum();
+ break;
+ case T_CALIBRATE:
+ strTitle = res.getString(R.string.txt_dlg_keep_horizontal);
+ strValue = "";
+ break;
+ default:
+ }
AlertDialog.Builder builder = new AlertDialog.Builder(this);
- if(lohi == 0)
- builder.setTitle(getApplication().getString(R.string.dlg_min_negative_travel));
- else
- builder.setTitle(getApplication().getString(R.string.dlg_max_positive_travel));
+ builder.setTitle(strTitle);
+
// Set up the input
input = new EditText(this);
// Specify the type of input expected; this, for example, sets the input as a password, and will mask the text
- input.setInputType(InputType.TYPE_CLASS_NUMBER);
- builder.setView(input);
-
- final int treshold = lohi;
+ if (strValue != "") {
+ input.setText(strValue); // show actual value
+ input.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
+ builder.setView(input);
+ }
// Set up the buttons
builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- if(treshold == 0){
- mGaugeViewModel.setMinTravel(input.getText().toString());
- mGaugeViewModel.setMinTravel2(input.getText().toString());
-
- }else{
- mGaugeViewModel.setMaxTravel(input.getText().toString());
- mGaugeViewModel.setMaxTravel2(input.getText().toString());
+ switch (t) {
+ case T_LIMIT:
+ if (lohi == 0) {
+ mGaugeViewModel.setMinTravelDia(input.getText().toString());
+ mGaugeViewModel.setMinTravelDia2(input.getText().toString());
+ mGaugeViewModel.notifyPropertyChanged(BR.minTravelSet);
+ } else {
+ mGaugeViewModel.setMaxTravelDia(input.getText().toString());
+ mGaugeViewModel.setMaxTravelDia2(input.getText().toString());
+ mGaugeViewModel.notifyPropertyChanged(BR.maxTravelSet);
+ }
+ break;
+ case T_CHORD:
+ mGaugeViewModel.setChordValueDia(input.getText().toString());
+ break;
+ case T_CALIBRATE:
+ mGaugeViewModel.onCalibrateClicked();
+ break;
+ default:
}
}
});
- builder.setNegativeButton(getApplication().getString(R.string.dlg_cancel), new DialogInterface.OnClickListener() {
+ builder.setNegativeButton(getApplication().getString(R.string.txt_dlg_cancel), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.cancel();
@@ -265,4 +369,189 @@ public void onClick(DialogInterface dialog, int which) {
}
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ //unregisterReceiver(this.mReceiver);
+
+ if (mBluetoothPipe != null) {
+ mBluetoothPipe.cancelDiscovery();
+ mBluetoothPipe.stopService();
+ }
+
+ // save the preference to each registered device
+ for (int i = 0; i < devicePrefs.size(); i++) {
+ DeviceTag tag = devicePrefs.get(i);
+ tag.setChord(mGaugeViewModel.getChordValue());
+ tag.setTravelMax(mGaugeViewModel.getMaxTravelSetNum());
+ tag.setTravelMin(mGaugeViewModel.getMinTravelSetNum());
+ }
+ BluetoothPreferences.setKeyrings(getApplicationContext(), devicePrefs);
+
+ // get rid of remaining thread
+ btWatcher.cancel();
+ }
+
+ class btStatusWatcherClass extends Thread
+ {
+ private volatile boolean exit = false;
+ private String btText[] = new String[2];
+ private String btTextAlt[] = new String[2];
+ private Drawable btColor[] = new Drawable[2];
+ private boolean btShowAlt[] = new boolean[2];
+
+ private boolean buttonResetEnabled[] = new boolean[2];
+ private boolean buttonCalEnabled[] = new boolean[2];
+
+ private int tick = 0;
+
+ public void run()
+ {
+ setName("btStatusWatcher");
+ if (mDeviceTags.size() > 0) {
+ btText[0] = mDeviceTags.get(0).name + " (" + mDeviceTags.get(0).address + ")";
+ }
+ if (mDeviceTags.size() > 1) {
+ btText[1] = mDeviceTags.get(1).name + " (" + mDeviceTags.get(1).address + ")";
+ }
+
+ while (!exit) {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ }
+
+ setTextAndColor(0);
+ setTextAndColor(1);
+
+ // enable/disable buttons
+ if (mGaugeViewModel.getMultiDevice()) {
+ mGaugeViewModel.setButtonResetAngleEnable(
+ !(busyReset || busyCalibration) && (buttonResetEnabled[0] && buttonResetEnabled[1]));
+ mGaugeViewModel.notifyPropertyChanged(BR.buttonResetAngleEnable);
+ mGaugeViewModel.setButtonCalibrateEnable(
+ !(busyReset || busyCalibration) && (buttonCalEnabled[0] && buttonCalEnabled[1]));
+ mGaugeViewModel.notifyPropertyChanged(BR.buttonCalibrateEnable);
+ } else {
+ mGaugeViewModel.setButtonResetAngleEnable(
+ !(busyReset || busyCalibration) && buttonResetEnabled[0]);
+ mGaugeViewModel.notifyPropertyChanged(BR.buttonResetAngleEnable);
+ mGaugeViewModel.setButtonCalibrateEnable(
+ !(busyReset || busyCalibration) && buttonCalEnabled[0]);
+ mGaugeViewModel.notifyPropertyChanged(BR.buttonCalibrateEnable);
+ }
+
+ switch (tick) {
+ case 0:
+ mGaugeViewModel.setBtStatus(btText[0]);
+ mGaugeViewModel.notifyPropertyChanged(BR.btStatus);
+ mGaugeViewModel.setBtStatusColor(btColor[0]);
+ mGaugeViewModel.notifyPropertyChanged(BR.btStatusColor);
+
+ mGaugeViewModel.setBtStatus2(btText[1]);
+ mGaugeViewModel.notifyPropertyChanged(BR.btStatus2);
+ mGaugeViewModel.setBtStatusColor2(btColor[1]);
+ mGaugeViewModel.notifyPropertyChanged(BR.btStatusColor2);
+
+ if (btShowAlt[0]) {
+ mGaugeViewModel.setBtStatus(btTextAlt[0]);
+ mGaugeViewModel.notifyPropertyChanged(BR.btStatus);
+ }
+ if (btShowAlt[1]) {
+ mGaugeViewModel.setBtStatus2(btTextAlt[1]);
+ mGaugeViewModel.notifyPropertyChanged(BR.btStatus2);
+ }
+ break;
+ case 10:
+ mGaugeViewModel.setBtStatus(btText[0]);
+ mGaugeViewModel.notifyPropertyChanged(BR.btStatus);
+ mGaugeViewModel.setBtStatusColor(btColor[0]);
+ mGaugeViewModel.notifyPropertyChanged(BR.btStatusColor);
+
+ mGaugeViewModel.setBtStatus2(btText[1]);
+ mGaugeViewModel.notifyPropertyChanged(BR.btStatus2);
+ mGaugeViewModel.setBtStatusColor2(btColor[1]);
+ mGaugeViewModel.notifyPropertyChanged(BR.btStatusColor2);
+ break;
+ default:
+ break;
+ }
+ tick = (tick >= 20) ? 0 : tick + 1;
+ }
+ }
+
+ public void cancel() {
+ exit = true;
+ }
+
+ // TODO AHa: not used
+// private Drawable getWitColor(int channel) {
+// Drawable color = ResourcesCompat.getDrawable(getApplication().getResources(), R.drawable.layout_range_red, null);
+// switch (mGaugeViewModel.getWitLinkStatus(channel)) {
+// case BluetoothState.WIT_IDLE:
+// color = ResourcesCompat.getDrawable(getApplication().getResources(), R.drawable.layout_range_red, null);
+// break;
+// case BluetoothState.WIT_DATA_ARRIVING:
+// color = ResourcesCompat.getDrawable(getApplication().getResources(), R.drawable.layout_range_blue, null);
+// break;
+// default:
+// }
+// mGaugeViewModel.setWitLinkStatus(channel, BluetoothState.WIT_IDLE);
+// return color;
+// }
+
+ private void setTextAndColor (int channel) {
+ int linkState;
+ int witState;
+
+ // mBluetoothService.getState() might be called before method is available
+ try {
+ linkState = mBluetoothService.getState();
+ } catch (Exception e) {
+ linkState = BluetoothState.STATE_NONE;
+ }
+ // witmotion data status
+ witState = mGaugeViewModel.getWitLinkStatus(channel);
+ // TODO AHa: states should not combined for both sensors
+ switch (linkState) {
+ case BluetoothState.STATE_CONNECTED:
+ if (witState == BluetoothState.WIT_DATA_ARRIVING) {
+ btColor[channel] = ResourcesCompat.getDrawable(getApplication().getResources(), R.drawable.layout_range_blue, null);
+ btTextAlt[channel] = "connected";
+ btShowAlt[channel] = false;
+ buttonResetEnabled[channel] = true;
+ buttonCalEnabled[channel] = true;
+ } else {
+ btColor[channel] = ResourcesCompat.getDrawable(getApplication().getResources(), R.drawable.layout_range_red, null);
+ btTextAlt[channel] = "connected wait";
+ btShowAlt[channel] = true;
+ buttonResetEnabled[channel] = false;
+ buttonCalEnabled[channel] = false;
+ }
+ break;
+ case BluetoothState.STATE_CONNECTING:
+ btColor[channel] = ResourcesCompat.getDrawable(getApplication().getResources(), R.drawable.layout_range_red, null);
+ btTextAlt[channel] = "connecting";
+ btShowAlt[channel] = true;
+ buttonResetEnabled[channel] = false;
+ buttonCalEnabled[channel] = false;
+ break;
+ case BluetoothState.STATE_LISTEN:
+ btColor[channel] = ResourcesCompat.getDrawable(getApplication().getResources(), R.drawable.layout_range_red, null);
+ btTextAlt[channel] = "listening";
+ btShowAlt[channel] = true;
+ buttonResetEnabled[channel] = false;
+ buttonCalEnabled[channel] = false;
+ break;
+
+ default:
+ btColor[channel] = ResourcesCompat.getDrawable(getApplication().getResources(), R.drawable.layout_range_red, null);
+ btTextAlt[channel] = "opening";
+ btShowAlt[channel] = true;
+ buttonResetEnabled[channel] = false;
+ buttonCalEnabled[channel] = false;
+ break;
+ }
+ }
+ }
}
diff --git a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/ThrowGauge.java b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/ThrowGauge.java
index b9e252f..76f3415 100644
--- a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/ThrowGauge.java
+++ b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/ThrowGauge.java
@@ -4,6 +4,8 @@
import org.joml.Vector3d;
import org.joml.Quaterniond;
+import static java.lang.Math.abs;
+
public class ThrowGauge {
boolean mResetArmed = false;
@@ -39,19 +41,19 @@ public void SetNeutral()
toQuaternion(mQBoardNeutral, mEulerYaw, mEulerPitch, mEulerRoll);
}
- public boolean HasResumed(){
+ public boolean HasResumed() {
return !mResetArmed;
}
- public void ResetMath(){
+ public void ResetMath() {
mResetArmed = true;
}
- public void SetChord(double chord){
+ public void SetChord(double chord) {
mChord = chord;
}
- public double GetChord(){
+ public double GetChord() {
return mChord;
}
@@ -90,14 +92,22 @@ public double GetTemperature(){
return mTemperature;
}
- public double GetMinThrow(){
+ public double GetMinThrow() {
return mMinThrow;
}
- public double GetMaxThrow(){
+ public double GetMaxThrow() {
return mMaxThrow;
}
+ public double GetSetMaxThrow() {
+ return mMaxTravelAlarm;
+ }
+
+ public double GetSetMinThrow() {
+ return abs(mMinTravelAlarm);
+ }
+
public double GetAngle(){
if(mUseQuats) {
return Math.toDegrees(mQuatAngle);
@@ -149,7 +159,7 @@ public double GetNeutralQuatW(){
return mQBoardNeutral.w;
}
- public double ResolveSimpleThrow(){
+ public double ResolveSimpleThrow() {
mCurrentTravel = - mChord * Math.sin( Math.toRadians(mAngle));
if(mCurrentTravel < mMinThrow)
mMinThrow = mCurrentTravel;
@@ -158,22 +168,20 @@ public double ResolveSimpleThrow(){
return mCurrentTravel;
}
- public void SetMaxTravel(double travel){
+ public void SetMaxTravel(double travel) {
mMaxTravelAlarm = travel;
}
public void SetMinTravel(double travel){
- if (travel > 0) {
- travel *= -1;
- }
+ travel = -1 * abs(travel);
mMinTravelAlarm = travel;
}
- public void SetMaxTravel(){
+ public void SetMaxTravel() {
mMaxTravelAlarm = mMaxThrow;
}
- public void SetMinTravel(){
+ public void SetMinTravel() {
mMinTravelAlarm = mMinThrow;
}
@@ -192,16 +200,16 @@ public boolean IsBelowTravelMin(){
public double ResolveQuatsThrow() {
toQuaternion(mQBoard, mEulerYaw, mEulerPitch, mEulerRoll);
Vector3d delta = EulerAnglesBetween(mQBoard, mQBoardNeutral);
- int sign = delta.y > 0 ? 1 : -1;
+ int sign = delta.y > 0 ? -1 : 1;
mQBoard.difference(mQBoardNeutral);
- mQuatAngle = mQBoard.angle();
- mCurrentTravel = - mChord * Math.sin(mQuatAngle)* sign;
+ mQuatAngle = mQBoard.angle() * sign;
+ mCurrentTravel = mChord * Math.sin(mQuatAngle);
if(mCurrentTravel < mMinThrow)
mMinThrow = mCurrentTravel;
if(mCurrentTravel > mMaxThrow)
mMaxThrow = mCurrentTravel;
- //TODO not clear
+ //TODO AHa: purpose not clear
/* mMaxThrow = mCurrentTravel;
mMinThrow = mCurrentTravel;
*/
diff --git a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/ThrowGaugeViewModel.java b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/ThrowGaugeViewModel.java
index b54e87c..8fc5cc7 100644
--- a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/ThrowGaugeViewModel.java
+++ b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/ThrowGaugeViewModel.java
@@ -6,11 +6,14 @@
import android.databinding.Bindable;
import android.databinding.Observable;
import android.databinding.PropertyChangeRegistry;
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
import android.support.v4.content.res.ResourcesCompat;
import android.view.View;
@@ -25,6 +28,38 @@ public class ThrowGaugeViewModel extends AndroidViewModel implements Observable
private Handler mHandler;
private boolean mMultiDevice;
+ private String btStatusStr = "BT1";
+ private String btStatusStr2 = "BT2";
+
+ private Drawable btStatusCol = ResourcesCompat.getDrawable(getApplication().getResources(), R.drawable.layout_range_red, null);
+ private Drawable btStatusCol2 = ResourcesCompat.getDrawable(getApplication().getResources(), R.drawable.layout_range_red, null);
+
+ private int witLinkStatus[] = {BluetoothState.WIT_IDLE, BluetoothState.WIT_IDLE};
+
+ public void setBtStatusColor(Drawable colour) {
+ this.btStatusCol = colour;
+ }
+
+ public void setBtStatusColor2(Drawable colour) {
+ this.btStatusCol2 = colour;
+ }
+
+ private boolean buttonResetAngleEnable = true;
+ private boolean buttonCalibrateEnable = true;
+
+
+ // parse number string using language specfic number format (comma separator , or .)
+ // get rid of number dialog sending . instead of , (android bug)
+ private double parseStringDouble(String s) {
+ double d;
+ try {
+ d = Double.parseDouble(s.toString().replace(',', '.'));
+ } catch (NumberFormatException e) {
+ d = 0.0;
+ }
+ return d;
+ }
+
@Override
public void addOnPropertyChangedCallback(
Observable.OnPropertyChangedCallback callback) {
@@ -84,17 +119,16 @@ public MutableLiveData getThrowGauge2() {
return mThrowGauge2;
}
- public void setChord(String chord){
- if(!isNumeric(chord))
- return;
- if(chord == "")
- return;
- getThrowGauge().getValue().SetChord(Double.parseDouble(chord));
- getThrowGauge2().getValue().SetChord(Double.parseDouble(chord));
+ public void setChordValue(String chord) {
+ }
+ public void setChordValueDia(String chord) {
+ double d = parseStringDouble(chord);
+ getThrowGauge().getValue().SetChord(d);
+ getThrowGauge2().getValue().SetChord(d);
+ notifyPropertyChanged(BR.chordValue);
notifyPropertyChanged(BR.travel);
notifyPropertyChanged(BR.travel2);
-
}
public void setAccelerations(int pos, float x, float y, float z){
@@ -116,26 +150,31 @@ public void setVelocities(int pos, float x, float y, float z){
public void setAngles(int pos, float x, float y, float z){
if (pos == 0) {
getThrowGauge().getValue().SetAngles(x, y, z);
+ setWitLinkStatus(0, BluetoothState.WIT_DATA_ARRIVING);
notifyPropertyChanged(BR.angle);
notifyPropertyChanged(BR.travel);
notifyPropertyChanged(BR.maxTravel);
notifyPropertyChanged(BR.minTravel);
+ notifyPropertyChanged(BR.maxTravelSet);
+ notifyPropertyChanged(BR.minTravelSet);
notifyPropertyChanged(BR.maxTravelColor);
notifyPropertyChanged(BR.minTravelColor);
notifyPropertyChanged(BR.travelColor);
-
+ notifyPropertyChanged(BR.btStatusColor);
} else {
getThrowGauge2().getValue().SetAngles(x, y, z);
+ setWitLinkStatus(1, BluetoothState.WIT_DATA_ARRIVING);
notifyPropertyChanged(BR.angle2);
notifyPropertyChanged(BR.travel2);
notifyPropertyChanged(BR.maxTravel2);
notifyPropertyChanged(BR.minTravel2);
+ notifyPropertyChanged(BR.maxTravelSet);
+ notifyPropertyChanged(BR.minTravelSet);
notifyPropertyChanged(BR.maxTravelColor2);
notifyPropertyChanged(BR.minTravelColor2);
notifyPropertyChanged(BR.travelColor2);
-
+ notifyPropertyChanged(BR.btStatusColor2);
}
-
}
public void setTemperature(float t){
@@ -158,11 +197,9 @@ public void setAngle(String angle){
notifyPropertyChanged(BR.maxTravelColor);
notifyPropertyChanged(BR.minTravelColor);
notifyPropertyChanged(BR.travelColor);
-
}
}
catch (Exception e){
-
}
}
@@ -182,11 +219,9 @@ public void setAngle2(String angle){
notifyPropertyChanged(BR.maxTravelColor2);
notifyPropertyChanged(BR.minTravelColor2);
notifyPropertyChanged(BR.travelColor2);
-
}
}
catch (Exception e){
-
}
}
@@ -206,8 +241,12 @@ public String getAngle2() {
}
@Bindable
- public String getChord() {
- return Double.toString(getThrowGauge().getValue().GetChord());
+ public String getChordValue() {
+ return new DecimalFormat("0.0").format(getThrowGauge().getValue().GetChord());
+ }
+ // this version of getChordValue does not show decimal point, if not needed, for dialog
+ public String getChordValueNum() {
+ return new DecimalFormat("#.#").format(getThrowGauge().getValue().GetChord());
}
@Bindable
@@ -265,45 +304,123 @@ public String getNeutralQuatW(){
return "NeutralQuatW: " + new DecimalFormat("#0.0#").format(getThrowGauge().getValue().GetNeutralQuatW());
}
+
+ @Bindable
+ public String getBtStatus() {
+ String str = btStatusStr;
+ return str;
+ }
+
+ public void setBtStatus(String str) {
+ btStatusStr = str;
+ notifyPropertyChanged(BR.btStatus);
+ }
+
+ @Bindable
+ public String getBtStatus2() {
+ String str = btStatusStr2;
+ return str;
+ }
+
+ public void setBtStatus2(String str) {
+ btStatusStr2 = str;
+ notifyPropertyChanged(BR.btStatus2);
+ }
+
+ @Bindable
+ public Drawable getBtStatusColor() {
+ return btStatusCol;
+ }
+
+ @Bindable
+ public Drawable getBtStatusColor2() {
+ return btStatusCol2;
+ }
+
+ @Bindable
+ public boolean getButtonResetAngleEnable() {
+ return buttonResetAngleEnable;
+ }
+
+ public void setButtonResetAngleEnable(boolean enable) {
+ buttonResetAngleEnable = enable;
+ }
+
+ @Bindable
+ public boolean getButtonCalibrateEnable() {
+ return buttonCalibrateEnable;
+ }
+
+ public void setButtonCalibrateEnable(boolean enable) {
+ buttonCalibrateEnable = enable;
+ }
+
+
@Bindable
public String getTravel() {
double res = getThrowGauge().getValue().GetThrow();
- String str = new DecimalFormat("###0.0").format(res); // rounded to 2 decimal places
+ String str = new DecimalFormat("0.0").format(res); // rounded to 2 decimal places
return str;
}
@Bindable
public String getTravel2() {
double res = getThrowGauge2().getValue().GetThrow();
- String str = new DecimalFormat("###0.0").format(res); // rounded to 2 decimal places
+ String str = new DecimalFormat("0.0").format(res); // rounded to 2 decimal places
return str;
}
@Bindable
public String getMaxTravel() {
double res = getThrowGauge().getValue().GetMaxThrow();
- String str = new DecimalFormat("###.#").format(res); // rounded to 2 decimal places
+ String str = new DecimalFormat("0.0").format(res); // rounded to 2 decimal places
return str;
}
@Bindable
public String getMaxTravel2() {
double res = getThrowGauge2().getValue().GetMaxThrow();
- String str = new DecimalFormat("###.#").format(res); // rounded to 2 decimal places
+ String str = new DecimalFormat("0.0").format(res); // rounded to 2 decimal places
return str;
}
@Bindable
public String getMinTravel() {
double res = Math.abs(getThrowGauge().getValue().GetMinThrow());
- String str = new DecimalFormat("###.#").format(res); // rounded to 2 decimal places
+ String str = new DecimalFormat("0.0").format(res); // rounded to 2 decimal places
return str;
}
@Bindable
public String getMinTravel2() {
double res = Math.abs(getThrowGauge2().getValue().GetMinThrow());
- String str = new DecimalFormat("###.#").format(res); // rounded to 2 decimal places
+ String str = new DecimalFormat("0.0").format(res); // rounded to 2 decimal places
+ return str;
+ }
+
+ @Bindable
+ public String getMaxTravelSet() {
+ double res = getThrowGauge().getValue().GetSetMaxThrow();
+ String str = "Max " + new DecimalFormat("0.0").format(res);
+ return str;
+ }
+
+ public String getMaxTravelSetNum() {
+ double res = getThrowGauge().getValue().GetSetMaxThrow();
+ String str = new DecimalFormat("#.#").format(res);
+ return str;
+ }
+
+ @Bindable
+ public String getMinTravelSet() {
+ double res = getThrowGauge().getValue().GetSetMinThrow();
+ String str = "Min " + new DecimalFormat("0.0").format(res);
+ return str;
+ }
+
+ public String getMinTravelSetNum() {
+ double res = getThrowGauge().getValue().GetSetMinThrow();
+ String str = new DecimalFormat("#.#").format(res);
return str;
}
@@ -359,22 +476,21 @@ public int getSecondSensorVisible() {
return mMultiDevice?View.VISIBLE:View.GONE;
}
- public void setMinTravel(String value){
- int d = Integer.parseInt(value);
+ public void setMinTravelDia(String value){
+ double d = parseStringDouble(value);
getThrowGauge().getValue().SetMinTravel(d);
}
- public void setMinTravel2(String value){
- int d = Integer.parseInt(value);
+ public void setMinTravelDia2(String value){
+ double d = parseStringDouble(value);
getThrowGauge2().getValue().SetMinTravel(d);
}
- public void setMaxTravel(String value){
- int d = Integer.parseInt(value);
+ public void setMaxTravelDia(String value){
+ double d = parseStringDouble(value);
getThrowGauge().getValue().SetMaxTravel(d);
}
-
- public void setMaxTravel2(String value){
- int d = Integer.parseInt(value);
+ public void setMaxTravelDia2(String value){
+ double d = parseStringDouble(value);
getThrowGauge2().getValue().SetMaxTravel(d);
}
@@ -406,7 +522,6 @@ public void resetNeutral(){
notifyPropertyChanged(BR.minTravel2);
notifyPropertyChanged(BR.travelColor);
notifyPropertyChanged(BR.travelColor2);
- notifyPropertyChanged(BR.chord);
}
public void onResetAngleClicked() {
@@ -418,6 +533,15 @@ public void onResetAngleClicked() {
this.mHandler.sendMessage(msg);
}
+ public void onCalibrateClicked() {
+
+ Message msg = this.mHandler.obtainMessage(BluetoothState.MESSAGE_STATE_CHANGE);
+ Bundle bundle = new Bundle();
+ bundle.putString("Reset sensor", "Calibrate");
+ msg.setData(bundle);
+ this.mHandler.sendMessage(msg);
+ }
+
public boolean isNumeric(String str){
return str.matches("-?\\d+(.\\d+)?");
}
@@ -436,4 +560,17 @@ public double parseDecimal(String input) throws ParseException {
public void setMultiDevice(boolean multiDevice) {
mMultiDevice = multiDevice;
}
+
+ public boolean getMultiDevice() {
+ return mMultiDevice;
+ }
+
+ public int getWitLinkStatus(int channel) {
+ return witLinkStatus[channel];
+ }
+
+ public void setWitLinkStatus(int channel, int witLinkStatus) {
+ this.witLinkStatus[channel] = witLinkStatus;
+ }
+
}
diff --git a/app/src/main/res/drawable/btn_rounded_back_bold.xml b/app/src/main/res/drawable/btn_rounded_back_bold.xml
new file mode 100644
index 0000000..251d717
--- /dev/null
+++ b/app/src/main/res/drawable/btn_rounded_back_bold.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/layout_range_blue.xml b/app/src/main/res/drawable/layout_range_blue.xml
new file mode 100644
index 0000000..1d7b3c1
--- /dev/null
+++ b/app/src/main/res/drawable/layout_range_blue.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_rawdata.xml b/app/src/main/res/layout/activity_rawdata.xml
index e3406a7..a2e52e2 100644
--- a/app/src/main/res/layout/activity_rawdata.xml
+++ b/app/src/main/res/layout/activity_rawdata.xml
@@ -19,7 +19,7 @@
app:layout_constraintTop_toBottomOf="parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/command_angle"
+ android:hint="@string/txt_command_angle"
android:padding="8dp"
android:textSize="30dp"
android:text="@{CommandthrowViewModel.Angle}" />
diff --git a/app/src/main/res/layout/device_list.xml b/app/src/main/res/layout/device_list.xml
index ef671e7..10c01ff 100644
--- a/app/src/main/res/layout/device_list.xml
+++ b/app/src/main/res/layout/device_list.xml
@@ -10,7 +10,7 @@
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/title_paired_devices"/>
+ android:text="@string/txt_title_paired_devices"/>
+ android:text="@string/txt_button_select"/>
+ android:text="@string/txt_title_other_devices"/>
+ android:text="@string/txt_button_scan"/>
diff --git a/app/src/main/res/layout/throw_activity.xml b/app/src/main/res/layout/throw_activity.xml
index d92f956..0121d52 100644
--- a/app/src/main/res/layout/throw_activity.xml
+++ b/app/src/main/res/layout/throw_activity.xml
@@ -5,7 +5,6 @@
android:id="@+id/layout">
-
@@ -15,6 +14,48 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
+
+
+
+
+
+
+
+
-
+ android:text="@string/txt_chord"
+ android:minWidth="160dp"
+ android:padding="6dp" />
+
+
@@ -47,8 +96,8 @@
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:padding="2dp"
- android:text="@string/command_angle"
- android:textSize="30sp"
+ android:text="@string/txt_command_angle"
+ android:textSize="17sp"
app:layout_constraintTop_toBottomOf="@+id/textInputLayout" />
@@ -143,10 +192,10 @@
android:id="@+id/maxTravelsUP"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center_horizontal"
+ android:gravity="left"
android:padding="4dp"
- android:text="@string/command_maxthrow"
- android:textSize="22sp"
+ android:text="@string/txt_command_maxthrow"
+ android:textSize="17sp"
app:layout_constraintBottom_toTopOf="@+id/inMaxThrow_container"
app:layout_constraintTop_toBottomOf="@+id/travel_container" />
@@ -191,8 +240,9 @@
android:layout_weight="1"
android:background="@drawable/btn_rounded_back"
android:gravity="center"
- android:text="@string/set_max_travels"
- android:textSize="18sp" />
+ android:text="@{CommandthrowViewModel.MaxTravelSet}"
+ android:textAllCaps="false"
+ android:textSize="17sp" />
@@ -201,10 +251,10 @@
android:id="@+id/maxTravelsDown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center_horizontal"
+ android:gravity="left"
android:padding="4dp"
- android:text="@string/command_minthrow"
- android:textSize="22sp"
+ android:text="@string/txt_command_minthrow"
+ android:textSize="17sp"
app:layout_constraintBottom_toTopOf="@+id/inMinThrow_container"
app:layout_constraintTop_toBottomOf="@+id/inMaxThrow_container" />
@@ -216,7 +266,7 @@
android:gravity="center_horizontal"
android:orientation="horizontal"
android:padding="2dp"
- app:layout_constraintBottom_toTopOf="@+id/button"
+ app:layout_constraintBottom_toTopOf="@+id/buttonResetAngle"
app:layout_constraintTop_toBottomOf="@+id/maxTravelsDown">
@@ -251,15 +301,16 @@
android:layout_weight="1"
android:background="@drawable/btn_rounded_back"
android:gravity="center"
- android:text="@string/set_min_travels"
- android:textSize="18sp" />
+ android:text="@{CommandthrowViewModel.MinTravelSet}"
+ android:textAllCaps="false"
+ android:textSize="17sp" />
+
+
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index a2b0c55..febc094 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -7,15 +7,15 @@
+ android:title="@string/txt_throw_meter" />
-
+
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
new file mode 100644
index 0000000..518bf2e
--- /dev/null
+++ b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,27 @@
+
+
+ Einstellungen
+ BT Sensoren
+ Ruder Anzeige
+ Verbindung
+ Winkel Reset
+ Kalibrieren
+ Ausschlag
+ Winkel (\u00B0)
+ Gepaarte BT Geräte
+ Andere Geräte
+ Suchen
+ Max pos. Ausschlag
+ Max neg. Ausschlag
+ Max Ausschlag
+ Max Limit
+ Min Limit
+ Auswählen
+ Rudertiefe
+ Cancel
+ Max pos Ausschlag"
+ Min neg Ausschlag"
+ Sensor horizontal halten und nicht bewegen
+ Bluetooth nicht aktiv.
+ Ausschlag
+
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b9ab807..ea3cc90 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,24 +1,27 @@
- Réglages
- Capteur BT
- Mesure de débattement
- Connecter
- Remettre à zéro
- Débattement
- Angle
- Appareils appairés
- Autres appareils
- Scanner
- Max Positif:
- Max Negatif:
- Débattements Max
- Config. Max Positif
- Config. Max Negatif
- Sélectionner
- Corde
- Annuler
- Configurer Max Positif"
- Configurer Max Négatif"
- Bluetooth non activé.
+ Réglages
+ Capteur BT
+ Mesure de débattement
+ Connecter
+ Remettre à zéro
+ Calibrer
+ Débattement
+ Angle (\u00B0)
+ Appareils appairés
+ Autres appareils
+ Scanner
+ Max Positif
+ Max Negatif
+ Débattements Max
+ Config. Max Positif
+ Config. Max Negatif
+ Sélectionner
+ Corde
+ Annuler
+ Configurer Max Positif"
+ Configurer Max Négatif"
+ Tenez le capteur horizontalement et ne bougez pas
+ Bluetooth non activé.
+ Débattement
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e294e99..7d5e76e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,24 +1,27 @@
- Настройки
- Сенсоры BT
- Throw Meter
- Communicate
- Сброс расходов
- Расходы
- Углы
- Подключеные устройства
- Прочие устройства
- Сканировать
- Maксимально Вверх:
- Maксимально Вниз:
- Maксимальные Расходы
- Max
- Min
- Выбрать сенсоры
- Длина хорды
- Отмена
- Максимальные расходы вверх"
- Минимальные расходы вниз"
- Блутюз не включен
+ Настройки
+ Сенсоры BT
+ Throw Meter
+ Communicate
+ Сброс расходов
+ откалибровать
+ Расходы
+ Углы (\u00B0)
+ Подключеные устройства
+ Прочие устройства
+ Сканировать
+ Maксимально Вверх
+ Maксимально Вниз
+ Maксимальные Расходы
+ Max
+ Min
+ Выбрать сенсоры
+ Длина хорды
+ Отмена
+ Максимальные расходы вверх"
+ Минимальные расходы вниз"
+ Держите датчик горизонтально и не двигайтесь
+ Блутюз не включен
+ Расходы
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3a077a1..508a7c6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
RC Throwmeter
- v1.1
+ v1.2 (9-Mar-2021)Open navigation drawerClose navigation drawerAndroid Studio
@@ -11,26 +11,29 @@
Euler pitchEuler rollEuler yaw
-
- Settings
- Sensor BT
- Throw meter
- Communicate
- Reset angle
- Travel
- Angle
- Paired device
- Other device
- Scan
- Max UP:
- Max DOWN:
- Max travels
- Max
- Min
- Select
- Chord
- Cancel
- Max positive travel"
- Min negative travel"
- Bluetooth was not enabled.
+ BTStatus
+ Settings
+ BT Sensors
+ Throw meter
+ Communicate
+ Reset angle
+ Calibrate
+ Travel
+ Angle (\u00B0)
+ Paired device
+ Other device
+ Scan
+ Max UP
+ Max DOWN
+ Max travels
+ Max
+ Min
+ Select
+ Rudder Chord
+ Cancel
+ Max positive travel"
+ Min negative travel"
+ Keep sensor horizontal and do not move
+ Bluetooth was not enabled.
+ Travel
diff --git a/build.gradle b/build.gradle
index af70df7..98518ee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.3.2'
+ classpath 'com.android.tools.build:gradle:4.1.2'
// NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..f6b961f
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..60a8e81
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Sat Dec 05 18:54:33 CET 2020
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
diff --git a/local.properties b/local.properties
deleted file mode 100644
index e80c80f..0000000
--- a/local.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Wed Mar 13 19:08:36 CET 2019
-sdk.dir=/Users/vitas/Library/Android/sdk