Dev release

.github/workflows/build_android_signed.yml

@@ -1,7 +1,17 @@
 name: build_android_signed
 
-on: [push]
-
+on:
+  push:
+   branches:
+      - "2.5-evo"
+      - "dev-release"
+      - "release"
+   paths-ignore:
+      - '**.md'
+      - '**.asciidoc'
+      - '**.adoc'
+      - '.gitignore'
+      - 'LICENSE'
 
 defaults:
   run:

.github/workflows/build_package_Rock5.yml

@@ -2,10 +2,16 @@ name: build_package_rock5_debian
 
 on:
   push:
-    branches: [ "2.5-evo" ]
-  pull_request:
-    branches: [ "2.5-evo" ]
-
+   branches:
+      - "2.5-evo"
+      - "dev-release"
+      - "release"
+   paths-ignore:
+      - '**.md'
+      - '**.asciidoc'
+      - '**.adoc'
+      - '.gitignore'
+      - 'LICENSE'
 jobs:
   build:
     #runs-on: ubuntu-18.04
@@ -36,7 +42,7 @@ jobs:
       - name: Build Package
         run: |
           git clone https://github.com/OpenHD/ChrootCompilationTest /opt/ChrootCompilationTest
-          git clone -b 2.5-evo https://github.com/OpenHD/QOpenHD --recursive /opt/ChrootCompilationTest/additionalFiles
+          git clone -b ${{ github.ref_name }} https://github.com/OpenHD/QOpenHD --recursive /opt/ChrootCompilationTest/additionalFiles
           echo $CLOUDSMITH_API_KEY > /opt/ChrootCompilationTest/additionalFiles/cloudsmith_api_key.txt
           cd /opt/ChrootCompilationTest/
           sudo apt update

.github/workflows/build_package_rpi.yml

@@ -2,10 +2,16 @@ name: build_package_rpi
 
 on:
   push:
-    branches: [ "2.5-evo" ]
-  pull_request:
-    branches: [ "2.5-evo" ]
-
+   branches:
+      - "2.5-evo"
+      - "dev-release"
+      - "release"
+   paths-ignore:
+      - '**.md'
+      - '**.asciidoc'
+      - '**.adoc'
+      - '.gitignore'
+      - 'LICENSE'
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
@@ -68,7 +74,7 @@ jobs:
         command: "push"
         format: "deb"
         owner: "openhd"
-        repo: "openhd-2-3-evo"
+        repo: ${{ github.ref_name }}
         distro: "raspbian"
         release: "bullseye"
         republish: "true" # needed ONLY if version is not changing

.github/workflows/build_package_x86_jammy.yml

@@ -2,9 +2,16 @@ name: build_package_x86_22
 
 on:
   push:
-    branches: [ "2.5-evo" ]
-  pull_request:
-      branches: [ "2.5-evo" ]
+   branches:
+      - "2.5-evo"
+      - "dev-release"
+      - "release"
+   paths-ignore:
+      - '**.md'
+      - '**.asciidoc'
+      - '**.adoc'
+      - '.gitignore'
+      - 'LICENSE'
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@@ -47,7 +54,7 @@ jobs:
         command: "push"
         format: "deb"
         owner: "openhd"
-        repo: "openhd-2-3-evo"
+        repo: ${{ github.ref_name }}
         distro: "ubuntu"
         release: "jammy"
         republish: "true" # needed ONLY if version is not changing

.github/workflows/build_package_x86_usb_release.yml → .github/workflows/build_package_x86_lunar.yml

@@ -2,7 +2,11 @@ name: build_package_LUNAR
 
 on:
   push:
-    paths-ignore:
+   branches:
+      - "2.5-evo"
+      - "dev-release"
+      - "release"
+   paths-ignore:
       - '**.md'
       - '**.asciidoc'
       - '**.adoc'
@@ -62,7 +66,7 @@ jobs:
           command: "push"
           format: "deb"
           owner: "openhd"
-          repo: "openhd-2-3-evo"
+          repo: ${{ github.ref_name }}
           distro: "ubuntu"
           release: "lunar"
           republish: "true" # needed ONLY if version is not changing

app/telemetry/MavlinkTelemetry.cpp

@@ -105,6 +105,17 @@ void MavlinkTelemetry::process_mavlink_message(const mavlink_message_t& msg)
                 m_fc_comp_id=source_compid;
                 m_fc_found=true;
             }
+            else if(source_sysid==0){
+                qDebug()<<"Found betaflight FC:"<<source_sysid;
+                FCMavlinkSystem::instance().set_system_id(source_sysid);
+                m_fc_sys_id=source_sysid;
+                m_fc_comp_id=source_compid;
+                m_fc_found=true;
+            }
+            else
+            {
+                qDebug()<<"Got weird system:"<<source_sysid;
+            }
         }
 
     }

app/telemetry/models/fcmavlinksystem.cpp

@@ -487,12 +487,13 @@ std::optional<uint8_t> FCMavlinkSystem::get_fc_sys_id()
         return std::nullopt;
     }
     auto sys_id=m_sys_id;
-    assert(sys_id>0);
+    assert(sys_id>=0);
     return sys_id;
 }
 
 bool FCMavlinkSystem::set_system_id(int sys_id)
 {
+
     if(sys_id<=0 || sys_id >= UINT8_MAX){
         qWarning()<<"Invalid sys id";
         return false;

build_chroot.sh

@@ -11,8 +11,8 @@ cp -v *.dep /opt/out/
 echo "copied deb file"
 echo "push to cloudsmith"
 git describe --exact-match HEAD >/dev/null 2>&1
-echo "Pushing the package to OpenHD 2.4 repository"
+echo "Pushing the package to OpenHD dev-release repository"
 ls -a
 API_KEY=$(cat cloudsmith_api_key.txt)
-cloudsmith push deb --api-key "$API_KEY" openhd/openhd-2-3-evo/debian/bullseye *.deb || exit 1
+cloudsmith push deb --api-key "$API_KEY" openhd/dev-release/debian/bullseye *.deb || exit 1
 

systemd/rock3_h264_decode.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=rock_h264_decode
+
+[Service]
+User=root
+
+# Video decode via mpp, started by QOpenHD if needed (and stopped if needed)
+ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)96, clock-rate=(int)90000, media=(string)video, encoding-name=(string)H264' ! rtph264depay ! h264parse ! mppvideodec format=23 fast-mode=true ! queue ! kmssink plane-id=102"
+
+Restart=always
+RestartSec=2
+
+[Install]
+WantedBy=multi-user.target

systemd/rock3_h265_decode.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=rock_h265_decode
+
+[Service]
+User=root
+
+# Video decode via mpp, started by QOpenHD if needed (and stopped if needed)
+ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)96, clock-rate=(int)90000, media=(string)video, encoding-name=(string)H265' ! rtph265depay ! h265parse ! mppvideodec format=23 fast-mode=true ! queue ! kmssink plane-id=54"
+
+Restart=always
+RestartSec=1
+
+[Install]
+WantedBy=multi-user.target

systemd/rock3_mjpeg_decode.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=rock_mjpeg_decode
+
+[Service]
+User=root
+
+# Video decode via mpp, started by QOpenHD if needed (and stopped if needed)
+ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)26, clock-rate=(int)90000, media=(string)video, encoding-name=(string)JPEG' ! rtpjpegdepay ! jpegdec ! queue ! kmssink plane-id=54"
+
+Restart=always
+RestartSec=1
+
+[Install]
+WantedBy=multi-user.target

systemd/rock5_h264_decode.service

@@ -5,7 +5,7 @@ Description=rock_h264_decode
 User=root
 
 # Video decode via mpp, started by QOpenHD if needed (and stopped if needed)
-ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)96, clock-rate=(int)90000, media=(string)video, encoding-name=(string)H264' ! rtph264depay ! h264parse ! mppvideodec format=23 fast-mode=true ! kmssink plane-id=102"
+ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)96, clock-rate=(int)90000, media=(string)video, encoding-name=(string)H264' ! rtph264depay ! h264parse ! mppvideodec format=23 fast-mode=true ! queue ! kmssink plane-id=54"
 
 Restart=always
 RestartSec=2

systemd/rock5_h265_decode.service

@@ -5,7 +5,7 @@ Description=rock_h265_decode
 User=root
 
 # Video decode via mpp, started by QOpenHD if needed (and stopped if needed)
-ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)96, clock-rate=(int)90000, media=(string)video, encoding-name=(string)H265' ! rtph265depay ! h265parse ! mppvideodec format=23 fast-mode=true ! kmssink plane-id=102"
+ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)96, clock-rate=(int)90000, media=(string)video, encoding-name=(string)H265' ! rtph265depay ! h265parse ! mppvideodec format=23 fast-mode=true ! queue ! kmssink plane-id=102"
 
 Restart=always
 RestartSec=1

systemd/rock5_mjpeg_decode.service

@@ -5,7 +5,7 @@ Description=rock_mjpeg_decode
 User=root
 
 # Video decode via mpp, started by QOpenHD if needed (and stopped if needed)
-ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)26, clock-rate=(int)90000, media=(string)video, encoding-name=(string)JPEG' ! rtpjpegdepay ! jpegdec ! kmssink plane-id=102"
+ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, payload=(int)26, clock-rate=(int)90000, media=(string)video, encoding-name=(string)JPEG' ! rtpjpegdepay ! jpegdec ! queue ! kmssink plane-id=102"
 
 Restart=always
 RestartSec=1

systemd/rock5_qopenhd copy.service

@@ -0,0 +1,19 @@
+[Unit]
+Description=QOpenHD
+After=multi-user.target
+
+[Service]
+Type=simple
+Environment="QT_QPA_EGLFS_KMS_ATOMIC=1"
+Environment="QT_LOGGING_RULES=qt.qpa.egl*=true"
+Environment="QT_QPA_EGLFS_KMS_PLANE_INDEX=5"
+Environment="QT_QPA_EGLFS_FORCE888=1"
+Environment="QT_QPA_EGLFS_SWAPINTERVAL=0"
+Environment="QT_QPA_EGLFS_KMS_CONFIG=/usr/local/share/qopenhd/rock_qt_eglfs_kms_config.json"
+ExecStart=/usr/local/bin/QOpenHD -platform eglfs
+User=root
+Restart=always
+RestartSec=3
+
+[Install]
+WantedBy=multi-user.target