elisa-tech · dl9pf · Apr 30, 2025
diff --git a/bsp/meta-elisa-bsp-qemu/conf/layer.conf b/bsp/meta-elisa-bsp-qemu/conf/layer.conf
@@ -10,4 +10,4 @@ BBFILE_PATTERN_meta-elisa-bsp-qemu = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-elisa-bsp-qemu = "71"
 
 LAYERDEPENDS_meta-elisa-bsp-qemu = "core"
-LAYERSERIES_COMPAT_meta-elisa-bsp-qemu = "kirkstone"
+LAYERSERIES_COMPAT_meta-elisa-bsp-qemu = "scarthgap"
diff --git a/meta-elisa-demo/conf/layer.conf b/meta-elisa-demo/conf/layer.conf
@@ -10,4 +10,4 @@ BBFILE_PATTERN_meta-elisa-demo = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-elisa-demo = "30"
 
 LAYERDEPENDS_meta-elisa-demo = "meta-elisa"
-LAYERSERIES_COMPAT_meta-elisa-demo = "kirkstone"
+LAYERSERIES_COMPAT_meta-elisa-demo = "scarthgap"
diff --git a/meta-elisa-demo/recipes-agl-demo/cluster-dashboard/cluster-dashboard_git.bbappend b/meta-elisa-demo/recipes-agl-demo/cluster-dashboard/cluster-dashboard_git.bbappend
@@ -0,0 +1,17 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+SRC_URI += " file://0001-test-demo.patch \
+             file://0002-Add-new-icon.patch \
+           "
+
+
+CLUSTER_DEMO_VISS_HOSTNAME = "localhost"
+
+RDEPENDS:${PN}:append = " pipe-demo"
+
+
+#RDEPENDS:${PN}:append = " kuksa-val-agl \
+#                          kuksa-dbc-feeder \
+#                          kuksa-val-agl-demo-cluster \
+#                        "
+#
diff --git a/...-elisa/cluster/files/0001-test-demo.patch → ...ster-dashboard/files/0001-test-demo.patch b/...-elisa/cluster/files/0001-test-demo.patch → ...ster-dashboard/files/0001-test-demo.patch
@@ -1,7 +1,9 @@
-From 54e1af2672e66c17862b35c37f32cf74aafaf0a0 Mon Sep 17 00:00:00 2001
+From 86d1cd6a5a9eacbdb1ea5aab4c85ffbe377ee54a Mon Sep 17 00:00:00 2001
 From: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
 Date: Sat, 17 Oct 2020 23:28:04 +0100
-Subject: [PATCH] test demo
+Subject: [PATCH 2/3] test demo
+
+Upstream-Status: Inappropriate
 
 Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
 ---
@@ -10,7 +12,7 @@ Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
  2 files changed, 148 insertions(+), 7 deletions(-)
 
 diff --git a/app/ValueSource.qml b/app/ValueSource.qml
-index 2c48438..1f36025 100644
+index ce2a821..144dc2f 100644
 --- a/app/ValueSource.qml
 +++ b/app/ValueSource.qml
 @@ -85,7 +85,11 @@ Item {
@@ -25,7 +27,7 @@ index 2c48438..1f36025 100644
      property real temperature: 0.6
      property bool cruiseEnabled: false
      property bool cruiseSet: false
-@@ -184,6 +188,12 @@ Item {
+@@ -179,6 +183,12 @@ Item {
          running: runAnimation
          loops: 1
 
@@ -38,7 +40,7 @@ index 2c48438..1f36025 100644
          // We want a small pause at the beginning, but we only want it to happen once.
          PauseAnimation {
              duration: 1000
-@@ -204,6 +214,21 @@ Item {
+@@ -199,6 +209,21 @@ Item {
                  property: "startUp"
                  value: true
              }
@@ -60,7 +62,7 @@ index 2c48438..1f36025 100644
              PauseAnimation {
                  duration: 1000
              }
-@@ -212,6 +237,26 @@ Item {
+@@ -207,6 +232,26 @@ Item {
                  property: "startUp"
                  value: false
              }
@@ -87,7 +89,7 @@ index 2c48438..1f36025 100644
 
              ParallelAnimation {
                  NumberAnimation {
-@@ -231,6 +276,13 @@ Item {
+@@ -226,6 +271,13 @@ Item {
                      duration: 3000
                  }
              }
@@ -101,7 +103,7 @@ index 2c48438..1f36025 100644
              ParallelAnimation {
                  // We changed gears so we lost a bit of speed.
                  NumberAnimation {
-@@ -250,6 +302,13 @@ Item {
+@@ -245,6 +297,13 @@ Item {
                      duration: 600
                  }
              }
@@ -115,7 +117,7 @@ index 2c48438..1f36025 100644
              ParallelAnimation {
                  NumberAnimation {
                      target: valueSource
-@@ -266,6 +325,13 @@ Item {
+@@ -261,6 +320,13 @@ Item {
                      duration: 3000
                  }
              }
@@ -129,7 +131,7 @@ index 2c48438..1f36025 100644
              ParallelAnimation {
                  // We changed gears so we lost a bit of speed.
                  NumberAnimation {
-@@ -334,6 +400,19 @@ Item {
+@@ -329,6 +395,19 @@ Item {
                  }
              }
 
@@ -149,7 +151,7 @@ index 2c48438..1f36025 100644
              // Slow down a bit
              ParallelAnimation {
                  NumberAnimation {
-@@ -351,6 +430,12 @@ Item {
+@@ -346,6 +425,12 @@ Item {
                      duration: 6000
                  }
              }
@@ -162,7 +164,7 @@ index 2c48438..1f36025 100644
 
              // Turn signal on
              PropertyAction {
-@@ -447,6 +532,12 @@ Item {
+@@ -442,6 +527,12 @@ Item {
                      duration: 5000
                  }
              }
@@ -175,8 +177,8 @@ index 2c48438..1f36025 100644
 
              // Third to second gear.
              NumberAnimation {
-@@ -481,6 +572,12 @@ Item {
-                 to: 6.5
+@@ -476,6 +567,12 @@ Item {
+                 to: 6500
                  duration: 600
              }
 +            // Turn signal on
@@ -188,7 +190,7 @@ index 2c48438..1f36025 100644
 
              // Second to first gear.
              ParallelAnimation {
-@@ -499,9 +596,53 @@ Item {
+@@ -494,9 +591,53 @@ Item {
                      duration: 4500
                  }
              }
@@ -245,10 +247,10 @@ index 2c48438..1f36025 100644
          }
      }
 diff --git a/app/cluster-gauges.qml b/app/cluster-gauges.qml
-index d70db47..b9aded9 100644
+index f4a83ea..3c5278a 100644
 --- a/app/cluster-gauges.qml
 +++ b/app/cluster-gauges.qml
-@@ -117,7 +117,7 @@ ApplicationWindow {
+@@ -114,7 +114,7 @@ ApplicationWindow {
                      height: parent.height * 0.75
 
                      direction: Qt.LeftArrow
@@ -257,7 +259,7 @@ index d70db47..b9aded9 100644
                  }
              }
 
-@@ -207,7 +207,7 @@ ApplicationWindow {
+@@ -204,7 +204,7 @@ ApplicationWindow {
                  border.color: "grey"
 
                  Image {
@@ -266,7 +268,7 @@ index d70db47..b9aded9 100644
                      anchors.verticalCenter: parent.verticalCenter
                      anchors.horizontalCenter: parent.horizontalCenter
                      width: height
-@@ -269,7 +269,7 @@ ApplicationWindow {
+@@ -266,7 +266,7 @@ ApplicationWindow {
                  border.color: "grey"
 
                  Image {
@@ -275,7 +277,7 @@ index d70db47..b9aded9 100644
                      anchors.verticalCenter: parent.verticalCenter
                      anchors.horizontalCenter: parent.horizontalCenter
                      width: height
-@@ -288,7 +288,7 @@ ApplicationWindow {
+@@ -285,7 +285,7 @@ ApplicationWindow {
                  border.color: "grey"
 
                  Image {
@@ -284,7 +286,7 @@ index d70db47..b9aded9 100644
                      anchors.verticalCenter: parent.verticalCenter
                      anchors.horizontalCenter: parent.horizontalCenter
                      width: height
-@@ -371,7 +371,7 @@ ApplicationWindow {
+@@ -368,7 +368,7 @@ ApplicationWindow {
                      height: parent.height * 0.75
 
                      direction: Qt.RightArrow
@@ -294,5 +296,5 @@ index d70db47..b9aded9 100644
              }
          }
 -- 
-2.30.2
+2.43.0
 
diff --git a/...safety-demo/files/0001-Add-new-icon.patch → ...r-dashboard/files/0002-Add-new-icon.patch b/...safety-demo/files/0001-Add-new-icon.patch → ...r-dashboard/files/0002-Add-new-icon.patch
@@ -1,22 +1,24 @@
-From 8deeb3bb4bfffb276ea5fdb82370c546c3a7ad5f Mon Sep 17 00:00:00 2001
+From 022add0777188021df8bcda431106876637d00ad Mon Sep 17 00:00:00 2001
 From: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
 Date: Fri, 18 Nov 2022 21:00:25 +0000
-Subject: [PATCH] Add new icon and use can signals to corrupt
+Subject: [PATCH 3/3] Add new icon and use can signals to corrupt
+
+Upstream-Status: Inappropriate
 
 Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
 ---
  app/ValueSource.qml    | 11 +++---
- app/cluster-gauges.qml | 22 ++++++++++++
+ app/cluster-gauges.qml | 21 +++++++++++
  app/images/danger.svg  | 79 ++++++++++++++++++++++++++++++++++++++++++
  app/images/images.qrc  |  1 +
- 4 files changed, 109 insertions(+), 4 deletions(-)
+ 4 files changed, 108 insertions(+), 4 deletions(-)
  create mode 100644 app/images/danger.svg
 
 diff --git a/app/ValueSource.qml b/app/ValueSource.qml
-index 511a2a1..cc35817 100644
+index 144dc2f..3dd944d 100644
 --- a/app/ValueSource.qml
 +++ b/app/ValueSource.qml
-@@ -91,15 +91,15 @@ Item {
+@@ -95,15 +95,15 @@ Item {
      property bool cruiseSet: false
      property bool laneDepartureWarnEnabled: false
      property bool displayNumericSpeeds: true
@@ -35,15 +37,15 @@ index 511a2a1..cc35817 100644
      }
 
      Connections {
-@@ -118,6 +118,7 @@ Item {
+@@ -122,6 +122,7 @@ Item {
  	    VehicleSignals.subscribe("Vehicle.Cabin.SteeringWheel.Switches.CruiseCancel")
  	    VehicleSignals.subscribe("Vehicle.Cabin.SteeringWheel.Switches.LaneDepartureWarning")
  	    VehicleSignals.subscribe("Vehicle.Cabin.SteeringWheel.Switches.Info")
 +	    VehicleSignals.subscribe("Vehicle.Cabin.SteeringWheel.Switches.Horn")
  	    VehicleSignals.get("Vehicle.Cabin.Infotainment.HMI.DistanceUnit")
  	    VehicleSignals.subscribe("Vehicle.Cabin.Infotainment.HMI.DistanceUnit")
  	}
-@@ -164,7 +165,9 @@ Item {
+@@ -168,7 +169,9 @@ Item {
              } else if (path === "Vehicle.Cabin.SteeringWheel.Switches.LaneDepartureWarning" && value === "true") {
                  valueSource.laneDepartureWarnEnabled = !valueSource.laneDepartureWarnEnabled
              } else if (path === "Vehicle.Cabin.SteeringWheel.Switches.Info" && value === "true") {
@@ -55,18 +57,10 @@ index 511a2a1..cc35817 100644
                  if (value === "km") {
                      valueSource.mphDisplay = false
 diff --git a/app/cluster-gauges.qml b/app/cluster-gauges.qml
-index e4c299b..d70db47 100644
+index 3c5278a..22524a0 100644
 --- a/app/cluster-gauges.qml
 +++ b/app/cluster-gauges.qml
-@@ -389,6 +389,7 @@ ApplicationWindow {
-             //y: (parent.height - height) / 2
-             width: parent.width * 0.9
-             height: width
-+            visible: valueSource.displaySpeed === true
-
-             maximumValue: valueSource.mphDisplay ? 140 : 220
-             value: valueSource.kph * valueSource.speedScaling
-@@ -483,6 +484,27 @@ ApplicationWindow {
+@@ -447,6 +447,27 @@ ApplicationWindow {
          }
      }
 
@@ -191,5 +185,5 @@ index 6b4f2d2..86e4572 100644
      </qresource>
  </RCC>
 -- 
-2.30.2
+2.43.0
 
diff --git a/meta-elisa-demo/recipes-elisa/cluster-safety-demo/cluster-dashboard_git.bbappend b/meta-elisa-demo/recipes-elisa/cluster-safety-demo/cluster-dashboard_git.bbappend
diff --git a/meta-elisa-demo/recipes-elisa/cluster/cluster-dashboard_git.bbappend b/meta-elisa-demo/recipes-elisa/cluster/cluster-dashboard_git.bbappend
diff --git a/meta-elisa-demo/recipes-elisa/pipe-demo/cluster-dashboard_git.bbappend b/meta-elisa-demo/recipes-elisa/pipe-demo/cluster-dashboard_git.bbappend
diff --git a/meta-elisa-demo/recipes-platform/images/elisa-cluster-demo-platform-crosssdk.bb b/meta-elisa-demo/recipes-platform/images/elisa-cluster-demo-platform-crosssdk.bb
@@ -11,7 +11,7 @@ LICENSE = "MIT"
 IMAGE_FEATURES:append = " dev-pkgs"
 IMAGE_INSTALL:append = " kernel-dev kernel-devsrc"
 
-inherit populate_sdk populate_sdk_qt5
+inherit populate_sdk populate_sdk_qt6
 
 # Task do_populate_sdk and do_rootfs can't be exec simultaneously.
 # Both exec "createrepo" on the same directory, and so one of them

diff --git a/meta-elisa-demo/recipes-platform/images/elisa-cluster-demo-platform.bb b/meta-elisa-demo/recipes-platform/images/elisa-cluster-demo-platform.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Elisa extended AGL Cluster Demo Platform image currently contains a simple cluster interface."
 
-require recipes-platform/images/agl-cluster-demo-platform.bb
+require recipes-platform/images/agl-cluster-demo-qt.bb
 
 LICENSE = "MIT"
 

diff --git a/meta-elisa/conf/layer.conf b/meta-elisa/conf/layer.conf
@@ -10,5 +10,5 @@ BBFILE_PATTERN_meta-elisa = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-elisa = "30"
 
 LAYERDEPENDS_meta-elisa = "core"
-LAYERSERIES_COMPAT_meta-elisa = "kirkstone"
+LAYERSERIES_COMPAT_meta-elisa = "scarthgap"
 
diff --git a/templates/feature/elisa-cluster-demo/included.dep b/templates/feature/elisa-cluster-demo/included.dep
@@ -1 +1 @@
-agl-demo-cluster-support
+agl-demo