Recent changes to AndroidSample

AndroidSample modified by Jim

Jim — Sat, 07 Mar 2015 17:55:46 -0000

--- v5
+++ v6
@@ -32,7 +32,7 @@
 ##### Install from APK #####

 * please make sure that you have enabled "Allow installation of apps from other sources than Play Store" in "Settings->Security"
-* install the SensorDemo.apk on the mobile phone, please ignore eventual warnings that it is not installed officially from the Google Play Store
+* install samples/android/SensorDemo/SensorDemo.apk on the mobile phone, please ignore eventual warnings that it is not installed officially from the Google Play Store

 #### Configure the SensorDemo App ####

AndroidSample modified by Jim

Jim — Sat, 07 Mar 2015 11:32:31 -0000

--- v4
+++ v5
@@ -1,6 +1,11 @@
 # Android Sample #

-This is a sample project that runs on an Android 4.x smartphone. It reads the brightness sensor and the GPS sensor on the Android phone and sends it to the m2mlabs server.
+This is a sample project that runs on an Android 4.x smartphone. It reads the brightness sensor and the GPS sensor of the Android phone and sends it to the m2mlabs server.
+
+##### Please Note #####
+The server url of the m2mlabs server for this sample must be available as a public static IP adress so that the mobile phone can connect to it. If you are running your m2mlabs server behind a firewall you will have to apply port forwarding to the firewall. 
+
+To just make a test drive please send an email to [support@m2mlabs.com](mailto:support@m2mlabs.com) and we send you an apikey for our public demo machine.

 #### Create Device on M2MLabs Server ####

@@ -31,7 +36,7 @@

 #### Configure the SensorDemo App ####

-* configure server url, apikey, update rate and the device name
-* select the sensors you want to use
-* switch on sending data
-* check if data was received on the m2mlabs admin GUI at http://localhost/cs-ws:8080 or run the monitor at http://localhost/cs-ws:8080/monitor.html. The usage of the monitor is described in the [Monitor Tutorial](https://sourceforge.net/p/m2mlabs/wiki/Tutorial-Monitor)
+* configure server url, apikey, update rate, device name and sensors to use. The server url is either an IP address or a server name without the "http://" in front of it. Press CONFIGURE on the app main screen and enter your data. Then please close and re-open the app.
+![Android Sample](http://m2mlabs.com/sites/default/files/pictures/SensorDemo1.jpg?format=raw "Android sample")
+* switch on sending data by moving the "Send Data" slider on the app main screen to "on"
+* check if data was received on the m2mlabs admin GUI or run the monitor. The usage of the monitor is described in the [Monitor Tutorial](https://sourceforge.net/p/m2mlabs/wiki/Tutorial-Monitor)

AndroidSample modified by Jim

Jim — Sat, 07 Mar 2015 10:38:48 -0000

--- v3
+++ v4
@@ -1,37 +1,37 @@
 # Android Sample #

-This is a sample project that runs on an Android 4.x smartphone. It reads the light brightness sensor on the Android phone and sends it to the Mainspring server.
+This is a sample project that runs on an Android 4.x smartphone. It reads the brightness sensor and the GPS sensor on the Android phone and sends it to the m2mlabs server.
+
+#### Create Device on M2MLabs Server ####
+
+* go to the m2mLabs admin GUI. How to create device models, sensor models and devices is described in the [Tutorial](https://sourceforge.net/p/m2mlabs/wiki/Tutorial) 
+* create a sensor model with an attribute "brightness" of type number and "gpsdata" of type GpsData
+* create a device model with a sensor "LightSensor" and a sensor "GpsSensor" using the created sensor models
+* create a device
+
+#### Install on Phone ####

 Download the sample code from http://sourceforge.net/projects/m2mlabs/files/samples/samples.zip/download
-
-#### Install on Phone ####

 ##### Install from Source #####

 * download Android Studio from http://developer.android.com/sdk/index.html  and follow the installation instructions
-* using the SDK manager install API V17 for Android 4.2.2 (latest Android 4 SDK) and build tools 17
-* Select "Import project" and then select samples/android/SensorDemo
-* right click the app and execute "Make Module"
-* enable USB debugging on your mobile phone
+* using the SDK manager install API V17 for Android 4.2.2 (latest Android 4 SDK)
+* select "Import project" and then select samples/android/SensorDemo
+* select "Build->Make Project" on Android Studio main menu
+* enable "USB debugging" on your mobile phone in "Settings->Developer options"
 * connect your mobile phone with USB cable
-* click run 'app' on Android Studio main menu
+* select "Run->run 'app'" on Android Studio main menu
+* you can additionally start the Android device monitor with "Tools->Android->Android Device Monitor" on Android Studio main menu to view the debug output

 ##### Install from APK #####

-* please make sure that you have enabled "Installlation of apps from other sources than Playstore" in security settings
-* install the SensorDemo.apk on the mobile phone, please ignore warnings that it is not installed officially from the Google PlayStore
-
-#### Create Device on M2MLabs Server ####
-
-* go to the Mainspring admin gui
-* create a sensor model with an attribute "brightness" of type number and "gpsdata" of type GpsData
-* create a device model with a sensor "LightSensor" and a sensor "GpsSensor" using the created sensor models
-* create a device
+* please make sure that you have enabled "Allow installation of apps from other sources than Play Store" in "Settings->Security"
+* install the SensorDemo.apk on the mobile phone, please ignore eventual warnings that it is not installed officially from the Google Play Store

 #### Configure the SensorDemo App ####

 * configure server url, apikey, update rate and the device name
 * select the sensors you want to use
 * switch on sending data
-* check in the Mainspring admin gui that data is received from the Android device
-* open "http://<server url="">/cs-ws/monitor.html?apikey=<apikey>&device_name=<device name="">&attribute_name=brightness&maxvalue=1000" to view the brightness values on a graph
+* check if data was received on the m2mlabs admin GUI at http://localhost/cs-ws:8080 or run the monitor at http://localhost/cs-ws:8080/monitor.html. The usage of the monitor is described in the [Monitor Tutorial](https://sourceforge.net/p/m2mlabs/wiki/Tutorial-Monitor)

AndroidSample modified by Jim

Jim — Fri, 06 Mar 2015 22:32:04 -0000

--- v2
+++ v3
@@ -4,12 +4,33 @@

 Download the sample code from http://sourceforge.net/projects/m2mlabs/files/samples/samples.zip/download

-* install the M2MLabsSensorDemo.apk on the smartphone, please ignore warnings that it is not installed officially from the Google PlayStore
+#### Install on Phone ####
+
+##### Install from Source #####
+
+* download Android Studio from http://developer.android.com/sdk/index.html  and follow the installation instructions
+* using the SDK manager install API V17 for Android 4.2.2 (latest Android 4 SDK) and build tools 17
+* Select "Import project" and then select samples/android/SensorDemo
+* right click the app and execute "Make Module"
+* enable USB debugging on your mobile phone
+* connect your mobile phone with USB cable
+* click run 'app' on Android Studio main menu
+
+##### Install from APK #####
+
+* please make sure that you have enabled "Installlation of apps from other sources than Playstore" in security settings
+* install the SensorDemo.apk on the mobile phone, please ignore warnings that it is not installed officially from the Google PlayStore
+
+#### Create Device on M2MLabs Server ####
+
 * go to the Mainspring admin gui
 * create a sensor model with an attribute "brightness" of type number and "gpsdata" of type GpsData
 * create a device model with a sensor "LightSensor" and a sensor "GpsSensor" using the created sensor models
 * create a device
-* start the SensorDemo app and configure server url, apikey, update rate and the device name
+
+#### Configure the SensorDemo App ####
+
+* configure server url, apikey, update rate and the device name
 * select the sensors you want to use
 * switch on sending data
 * check in the Mainspring admin gui that data is received from the Android device

AndroidSample modified by Jim

Jim — Fri, 06 Mar 2015 19:56:27 -0000

--- v1
+++ v2
@@ -1,6 +1,8 @@
 # Android Sample #

 This is a sample project that runs on an Android 4.x smartphone. It reads the light brightness sensor on the Android phone and sends it to the Mainspring server.
+
+Download the sample code from http://sourceforge.net/projects/m2mlabs/files/samples/samples.zip/download

 * install the M2MLabsSensorDemo.apk on the smartphone, please ignore warnings that it is not installed officially from the Google PlayStore
 * go to the Mainspring admin gui

AndroidSample modified by Jim

Jim — Fri, 06 Mar 2015 19:21:36 -0000

Android Sample

This is a sample project that runs on an Android 4.x smartphone. It reads the light brightness sensor on the Android phone and sends it to the Mainspring server.

install the M2MLabsSensorDemo.apk on the smartphone, please ignore warnings that it is not installed officially from the Google PlayStore
go to the Mainspring admin gui
create a sensor model with an attribute "brightness" of type number and "gpsdata" of type GpsData
create a device model with a sensor "LightSensor" and a sensor "GpsSensor" using the created sensor models
create a device
start the SensorDemo app and configure server url, apikey, update rate and the device name
select the sensors you want to use
switch on sending data
check in the Mainspring admin gui that data is received from the Android device
open "http://<server url="">/cs-ws/monitor.html?apikey=<apikey>&device_name=<device name="">&attribute_name=brightness&maxvalue=1000" to view the brightness values on a graph