From 6ce8a90c1cdf0af96f4734c652b203fce8bf1929 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 7 Dec 2018 11:53:32 -0500 Subject: Rework mapviewer and mapviewer-demo Rework the mapviewer and mapviewer-demo recipes to get mapviewer working out of the box for the cluster demo: - Remove the old on/off scripts, as the intent is that the cluster demo work out of the box on an image built with the agl-cluster-demo-support feature. - The separate weston systemd unit has been replaced with a drop-in over-ride file. - A new systemd unit is installed to configure the network connection to the cluster board. This is required now because the weston unit no longer runs as root. - A systemd drop-in is added to have afm-api-windowmanager@.service depend on weston-ready. This is a bit of a workaround ATM, as the windowmanager service was consistently failing due to Weston taking longer to start with the gst-record feature enabled. It is likely that making this more generic should be investigated. - The mapviewer systemd unit has been updated. Its Install target is now afm-user-session@.target; in my testing this seemed the least invasive solution, as there are some dependency loop issues that currently prevent adding it to multi-user.target. As well, its dependencies have been updated from weston and HomeScreen to afm-api-windowmanager@, which is not entirely ideal, but is about the best that can be done ATM given that mapviewer interacts with the other windowmanager users via Weston, but is not an app framework application. Change-Id: I8826e670ae156edd461cc657acefc86e7836a916 Signed-off-by: Scott Murray --- recipes-demo-hmi/navigation/mapviewer/mapviewer.service | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) mode change 100755 => 100644 recipes-demo-hmi/navigation/mapviewer/mapviewer.service (limited to 'recipes-demo-hmi/navigation/mapviewer') diff --git a/recipes-demo-hmi/navigation/mapviewer/mapviewer.service b/recipes-demo-hmi/navigation/mapviewer/mapviewer.service old mode 100755 new mode 100644 index c7baae7a8..971327cc2 --- a/recipes-demo-hmi/navigation/mapviewer/mapviewer.service +++ b/recipes-demo-hmi/navigation/mapviewer/mapviewer.service @@ -1,22 +1,22 @@ [Unit] -Conflicts=getty@tty1.service -After=weston.service HomeScreen.service +Requires=afm-api-windowmanager@0.service +After=afm-api-windowmanager@0.service -# map viewr is a child application which can work with navigation. +# mapviewer is a child application which can work with navigation. # This app requires mapdata. It has to be stored at /var/mapdata/navi_data_UK . -# currently the position to be shown is 384x368 surface on screen 1 for CES2017 cluster demo. +# currently the position to be shown is 384x368 surface on screen 1 for cluster demo. [Service] +Environment="XDG_RUNTIME_DIR=/run/platform/display" ExecStartPre=/bin/sleep 5 ExecStart=/usr/bin/mapview ExecStartPost=/usr/bin/LayerManagerControl create layer 11001 1920 1080 ExecStartPost=/usr/bin/LayerManagerControl set layer 11001 visibility 1 ExecStartPost=/usr/bin/LayerManagerControl set screen 1 render order 11001 ExecStartPost=/usr/AGL/mapviewer/mapviewer-settings.sh - ExecStop=/usr/bin/killall -s KILL mapview Type=simple Restart=always [Install] -WantedBy=default.target +WantedBy=afm-user-session@.target -- cgit 1.2.3-korg