Merge ~lorn-potter/snappy-hwe-snaps/+git/sensehat-snap:leds into ~snappy-hwe-team/snappy-hwe-snaps/+git/sensehat:master

[Lorn Potter]

[Jim Hodapp (jhodapp)]

See comments inline. Over all looks good though.

review: Needs Fixing

[Jim Hodapp (jhodapp)]

LGTM

review: Approve (code)

diff --git a/README b/README
index 0c35eeb..012cffc 100644
--- a/README
+++ b/README
@@ -27,3 +27,11 @@ https://github.com/lpotter/sensors-examples.git
 
 to see sensor data, run the report.sh script, such as:
 sudo /snap/bin/sensehat.report compass
+
+To run the compass demo, first run
+sensehat.RTIMULibCal
+and calibrate the magnetometer and accelerometer.
+Then you can run sensehat.report example
+
+Hold the rpi with the power adapter side pointing down.
+
diff --git a/report.sh b/report.sh
index 268f2a8..75d41c4 100755
--- a/report.sh
+++ b/report.sh
@@ -25,6 +25,10 @@ export QT_PLUGIN_PATH=$SNAP/usr/lib/$ARCH/qt5/plugins
 export XDG_CONFIG_DIRS=$SNAP/etc/xdg
 export SENSEHAT_CONFIG_DIR=$SNAP_USER_DATA
 
+if [ ! -e "$HOME/RTIMULib.ini" ]
+then
+  cp $SNAP/etc/RTIMULib.ini $HOME/RTIMULib.ini
+fi
 
 while [[ $# -gt 0 ]]
 do
@@ -62,6 +66,10 @@ case $app in
     echo "pressure"
     exec "$SNAP/usr/bin/show_pressure"
     ;;
+    -e | example)
+    echo "example"
+    exec "$SNAP/usr/bin/sensehat-compass"
+    ;;
     --default)
     ;;
     *)
diff --git a/snapcraft.yaml b/snapcraft.yaml
index eaa1064..cde3ea5 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -7,14 +7,15 @@ description: |
   Source is available at:
   https://code.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/sensehat
 
-
 apps:
   RTIMULibDrive11:
     command: bin/RTIMULibDrive11
   RTIMULibCal:
-    command: bin/RTIMULibCal
+    command: bin/RTIMULibCal $HOME/snap/sensehat/current/RTIMULib
   report:
     command: bin/report.sh
+  sensehat-compass:
+    command: usr/bin/sensehat-compass
 
 parts:
   rtimulib:
@@ -44,3 +45,10 @@ parts:
     plugin: qmake
     qt-version: qt5
     source: https://github.com/lpotter/sensors-examples.git
+  sensehat-compass:
+    plugin: qmake
+    qt-version: qt5
+    source: https://github.com/lpotter/sensehat-compass.git
+    stage-packages:
+      - libpng12-0
+      - libfreetype6