Merge pull request #230 from jcmurray/master

Support for Google Eddystone specification

WheresMyBeacon/.settings/com.qnx.tools.ide.core.prefs

@@ -0,0 +1,2 @@
+QNX_CURRENT_INSTALL=BlackBerry 10 Native SDK 10.3.1
+eclipse.preferences.version=1

WheresMyBeacon/README.md

@@ -21,6 +21,7 @@ the [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0.html).
 * **V2.0.0** - Added ability to associate a friendly name with a beacon to aid identification. Added beacon configuration screen to allow SensorTag beacon attributes to be modified. 
 * **V2.0.1** - Minor change to deal with warnings about an API deprecated in 10.3.0 when building against the 10.3.0 SDK and above. No functional changes, hence no replacement pre-built signed BAR file.
 * **V2.1.0** - Added ability to detect the Open AltBeacon format of Beacon advertisement
+* **V2.2.0** - Added ability to detect the Google Eddystone format of Beacon advertisement
 
 **Known Issues**
 
@@ -34,10 +35,6 @@ the [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0.html).
 
 Simply Import the project into a workspace in your NDK. 
 
-**But I don't want to build it myself!**
-
-If you don't want to build this sample application yourself we've included a pre-built and signed BAR file. You can find it in the folder "**installable-bar-files**".
-
 **To contribute code to this repository you must be [signed up as an 
 official contributor](http://blackberry.github.com/howToContribute.html).**
 
@@ -52,4 +49,4 @@ If you find a bug in a Sample, or have an enhancement request, simply file an [I
 
 ## Disclaimer
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

WheresMyBeacon/assets/AboutSheet.qml

@@ -135,7 +135,7 @@ Sheet {
                     Label {
                         id: taBody_about1
                         horizontalAlignment: HorizontalAlignment.Center
-                        text: qsTr("The WheresMyBeacon application demonstrates how to use iBeacon technology from a BlackBerry 10 application")
+                        text: qsTr("The WheresMyBeacon application demonstrates how to use Beacon technology from a BlackBerry 10 application")
                         multiline: true
                     }
 

WheresMyBeacon/assets/BeaconIdentity.qml

@@ -24,13 +24,16 @@ Sheet {
 
 	function setBeaconType(btype) {
 	    beacon_type = btype;
-	    var index=2;
+	    var index=3;
 	    if (btype == "Estimote") {
 	        index = 0;
 	    } else {
             if (btype == "SensorTag") {
                 index = 1;
             }
+            if (btype == "Eddystone") {
+                index = 2;
+            }
 	    }
 	    dd_beacon_type.setSelectedIndex(index);
 	}    
@@ -127,6 +130,10 @@ Sheet {
                     text: "SensorTag"
                     value: "SensorTag"
                 }
+                Option {
+                    text: "Eddystone"
+                    value: "Eddystone"
+                }
                 Option {
                     text: "Other"
                     value: "Other"

WheresMyBeacon/assets/main.qml

@@ -192,8 +192,41 @@ Page {
                                     text: " ID: " + ListItemData.ID
                                     visible: (ListItemData.TYPE == "ALTBEACON")
                                 }
+                                Label {
+                                    text: " Eddystone Telemetry Frame"
+                                    visible: (ListItemData.TYPE == "EDDYSTONE" && ListItemData.EDTYPE == "TLM")
+                                }
+                                Label {
+                                    text: " Eddystone URL Frame"
+                                    visible: (ListItemData.TYPE == "EDDYSTONE" && ListItemData.EDTYPE == "URL")
+                                }
+                                Label {
+                                    text: " Eddystone UID Frame"
+                                    visible: (ListItemData.TYPE == "EDDYSTONE" && ListItemData.EDTYPE == "UID")
+                                }
+                                Label {
+                                    text: " Namespace: " + ListItemData.NAMESPACE
+                                    visible: (ListItemData.TYPE == "EDDYSTONE" && ListItemData.EDTYPE == "UID")
+                                }
+                                Label {
+                                    text: " Instance Id: " + ListItemData.INSTANCEID
+                                    visible: (ListItemData.TYPE == "EDDYSTONE" && ListItemData.EDTYPE == "UID")
+                                }
+                                Label {
+                                    text: " Url: " + ListItemData.URL
+                                    visible: (ListItemData.TYPE == "EDDYSTONE" && ListItemData.EDTYPE == "URL")
+                                }
+                                Label {
+                                    text: " Battery Voltage: " + Math.floor(ListItemData.VOLTAGE*100)/100 + " V"
+                                    visible: (ListItemData.TYPE == "EDDYSTONE" && ListItemData.EDTYPE == "TLM")
+                                }
+                                Label {
+                                    text: " Beacon Temperature: " + ListItemData.TEMP
+                                    visible: (ListItemData.TYPE == "EDDYSTONE" && ListItemData.EDTYPE == "TLM")
+                                }
                                 Label {
                                     text: " Calibrated Power: " + ListItemData.RSSI + " Path Loss: " + ListItemData.LOSS
+                                    visible: (ListItemData.TYPE != "EDDYSTONE" || (ListItemData.TYPE == "EDDYSTONE" && ListItemData.EDTYPE != "TLM"))
                                 }
                                 Label {
                                     text: " Reserved: " + ListItemData.RESV