Add support for CAN driven speeds for the demo dashboard

Changes include:
- Update cluster-dashboard recipe to pull in libqtappfw for
  signal-composer support
- Add signal-composer and required low-can and gps bindings to
  agl-cluster-demo-platform image
- Add recipe to install configuration file that tells the
  cluster-dashboard app to use signal-composer vehicle and engine
  speed events instead of running the default animation loop,
  and a new agl-cluster-demo-preload feature template that drives
  adding the recipe to the image for demo purposes.

Bug-AGL: SPEC-3045

Change-Id: I193f9fd764b7610eaacc4c524522552bcc1e7ccc
Signed-off-by: Scott Murray <scott.murray@konsulko.com>

diff --git a/conf/include/agl-cluster-demo-preload.inc b/conf/include/agl-cluster-demo-preload.inc
new file mode 100644 (file)
index 0000000..dd6cc15
--- /dev/null
+++ b/conf/include/agl-cluster-demo-preload.inc
@@ -0,0 +1 @@
+DISTRO_FEATURES_append = " agl-cluster-demo-preload"

diff --git a/recipes-config/cluster-dashboard-demo-config/cluster-dashboard-demo-config_1.0.bb b/recipes-config/cluster-dashboard-demo-config/cluster-dashboard-demo-config_1.0.bb
new file mode 100644 (file)
index 0000000..f1fce78
--- /dev/null
+++ b/recipes-config/cluster-dashboard-demo-config/cluster-dashboard-demo-config_1.0.bb
@@ -0,0 +1,11 @@
+SUMMARY = "AGL cluster demo dashboard configuration file"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+SRC_URI += "file://AGL.conf.cluster"
+
+inherit allarch
+
+do_install() {
+    install -D -m 0644 ${WORKDIR}/AGL.conf.cluster ${D}${sysconfdir}/xdg/AGL.conf
+}

diff --git a/recipes-config/cluster-dashboard-demo-config/files/AGL.conf.cluster b/recipes-config/cluster-dashboard-demo-config/files/AGL.conf.cluster
new file mode 100644 (file)
index 0000000..dd8a912
--- /dev/null
+++ b/recipes-config/cluster-dashboard-demo-config/files/AGL.conf.cluster
@@ -0,0 +1,2 @@
+[dashboard]
+animation=false

diff --git a/recipes-demo-hmi/cluster-dashboard/cluster-dashboard_git.bb b/recipes-demo-hmi/cluster-dashboard/cluster-dashboard_git.bb
index 74974eb..5420d34 100644 (file)
--- a/recipes-demo-hmi/cluster-dashboard/cluster-dashboard_git.bb
+++ b/recipes-demo-hmi/cluster-dashboard/cluster-dashboard_git.bb
@@ -14,7 +14,7 @@ PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
 # build-time dependencies
-DEPENDS += "qtquickcontrols2 qtwebsockets qlibwindowmanager"
+DEPENDS += "qtquickcontrols2 qtwebsockets qlibwindowmanager libqtappfw glib-2.0"
 
 inherit pkgconfig cmake_qt5 aglwgt
 
@@ -24,6 +24,6 @@ RDEPENDS_${PN} += " \
        qtquickcontrols-qmlplugins \
        qtquickcontrols2 \
        qtquickcontrols2-qmlplugins \
-       qtwebsockets \
-       qtwebsockets-qmlplugins \
+       libqtappfw \
+       agl-service-signal-composer \
 "

diff --git a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb
index 3b0c91c..3256fb6 100644 (file)
--- a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb
@@ -26,14 +26,21 @@ AGL_APPS = " \
 
 AGL_APIS = " \
     agl-service-windowmanager \
+    agl-service-can-low-level \
+    agl-service-gps \
+    agl-service-signal-composer \
     "
 
+DEMO_PRELOAD = "${@bb.utils.contains("DISTRO_FEATURES", "agl-cluster-demo-preload", "cluster-dashboard-demo-config", "",d)}"
+
 RDEPENDS_${PN}_append = " \
     wayland-ivi-extension \
     cluster-windowmanager-conf \
     hmi-debug \
+    can-utils \
     libva-utils \
     linux-firmware-ralink \
     ${AGL_APPS} \
     ${AGL_APIS} \
+    ${DEMO_PRELOAD} \
 "

diff --git a/templates/feature/agl-cluster-demo-preload/50_local.conf.inc b/templates/feature/agl-cluster-demo-preload/50_local.conf.inc
new file mode 100644 (file)
index 0000000..f15acf6
--- /dev/null
+++ b/templates/feature/agl-cluster-demo-preload/50_local.conf.inc
@@ -0,0 +1,2 @@
+#see meta-agl-cluster-demo/conf/include/agl-cluster-demo-preload.inc
+require conf/include/agl-cluster-demo-preload.inc

diff --git a/templates/feature/agl-cluster-demo-preload/README_feature_agl-cluster-demo-preload.md b/templates/feature/agl-cluster-demo-preload/README_feature_agl-cluster-demo-preload.md
new file mode 100644 (file)
index 0000000..bfb2108
--- /dev/null
+++ b/templates/feature/agl-cluster-demo-preload/README_feature_agl-cluster-demo-preload.md
@@ -0,0 +1,9 @@
+---
+description: Feature agl-cluster-demo-preload
+authors: Scott Murray <scott.murray@konsulko.com>
+---
+
+### Feature agl-cluster-demo-preload
+
+*Description is missing - please complete file meta-agl-cluster-demo/templates/feature/agl-cluster-demo-preload/README_feature_agl-cluster-demo-preload.md*
+