Dev

.github/workflows/Windows.yml

@@ -2,9 +2,16 @@ name: OpenHD Image Writer Windows
 
 on:
   push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+   branches:
+      - "2.5-evo"
+      - "dev-release"
+      - "release"
+   paths-ignore:
+      - '**.md'
+      - '**.asciidoc'
+      - '**.adoc'
+      - '.gitignore'
+      - 'LICENSE'
 
 env:
   BUILD_TYPE: Release

.github/workflows/macos.yml

@@ -2,7 +2,17 @@ name: Build MacOS
 
 on:
   push:
-
+   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
@@ -33,6 +43,7 @@ jobs:
     - name: Build
       # Build your program with the given configuration
       run: |
+        cmake --version
         cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
         cd ../build/
         ls -a

.github/workflows/ubuntu20.04.yml

@@ -4,13 +4,17 @@ name: OpenHD Image Writer
 
 # Controls when the workflow will run
 on:
-  # Triggers the workflow on push or pull request events but only for the "qml" branch
   push:
-    branches: [ "master" ]
-    paths-ignore:
-      - '**/Windows.yml'
-  pull_request:
-    branches: [ "master" ]
+   branches:
+      - "2.5-evo"
+      - "dev-release"
+      - "release"
+   paths-ignore:
+      - '**.md'
+      - '**.asciidoc'
+      - '**.adoc'
+      - '.gitignore'
+      - 'LICENSE'
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -43,16 +47,16 @@ jobs:
             *.deb
           if-no-files-found: error
 
-      - name: Push
-        id: push
-        uses: cloudsmith-io/action@master
-        with:
-          api-key: ${{ secrets.CLOUDSMITH_API_KEY }}
-          command: "push"
-          format: "deb"
-          owner: "openhd"
-          repo: "openhd-2-3-evo"
-          distro: "ubuntu"
-          release: "focal"
-          republish: "true" # needed ONLY if version is not changing
-          file: "*.deb"
+      # - name: Push
+      #   id: push
+      #   uses: cloudsmith-io/action@master
+      #   with:
+      #     api-key: ${{ secrets.CLOUDSMITH_API_KEY }}
+      #     command: "push"
+      #     format: "deb"
+      #     owner: "openhd"
+      #     repo: "openhd-2-3-evo"
+      #     distro: "ubuntu"
+      #     release: "focal"
+      #     republish: "true" # needed ONLY if version is not changing
+      #     file: "*.deb"

.github/workflows/ubuntu22.04.yml

@@ -0,0 +1,63 @@
+# This is a basic workflow to help you get started with Actions
+
+name: OpenHD Image Writer
+
+on:
+  push:
+   branches:
+      - "2.5-evo"
+      - "dev-release"
+      - "release"
+      - "2.0"
+   paths-ignore:
+      - '**.md'
+      - '**.asciidoc'
+      - '**.adoc'
+      - '.gitignore'
+      - 'LICENSE'
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-22.04
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      # Runs a set of commands using the runners shell
+      - name: Build
+        run: |
+          sudo apt update
+          sudo apt upgrade -y
+          sudo apt install -y --no-install-recommends libgnutls28-dev build-essential devscripts debhelper cmake git libarchive-dev libcurl4-openssl-dev qtbase5-dev qtbase5-dev-tools qtdeclarative5-dev libqt5svg5-dev qttools5-dev libssl-dev qml-module-qtquick2 qml-module-qtquick-controls2 qml-module-qtquick-layouts qml-module-qtquick-templates2 qml-module-qtquick-window2 qml-module-qtgraphicaleffects
+          mkdir build
+          mv `ls -A | grep -v "build"` build
+          cd build
+          debuild -uc -us
+          cd ..
+
+      - name: Upload to Github
+        uses: 'actions/upload-artifact@v2'
+        with:
+          name: "OpenHD Image Writer"
+          path: |
+            *.deb
+          if-no-files-found: error
+
+      - name: Push
+        id: push
+        uses: cloudsmith-io/action@master
+        with:
+          api-key: ${{ secrets.CLOUDSMITH_API_KEY }}
+          command: "push"
+          format: "deb"
+          owner: "openhd"
+          repo: ${{ github.ref_name }}
+          distro: "ubuntu"
+          release: "jammy"
+          republish: "true" # needed ONLY if version is not changing
+          file: "*.deb"

.github/workflows/ubuntu23.04.yml

@@ -4,13 +4,17 @@ name: OpenHD Image Writer lunar
 
 # Controls when the workflow will run
 on:
-  # Triggers the workflow on push or pull request events but only for the "qml" branch
   push:
-    branches: [ "master" ]
-    paths-ignore:
-      - '**/Windows.yml'
-  pull_request:
-    branches: [ "master" ]
+   branches:
+      - "2.5-evo"
+      - "dev-release"
+      - "release"
+   paths-ignore:
+      - '**.md'
+      - '**.asciidoc'
+      - '**.adoc'
+      - '.gitignore'
+      - 'LICENSE'
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -61,7 +65,7 @@ jobs:
           command: "push"
           format: "deb"
           owner: "openhd"
-          repo: "openhd-x86-evo"
+          repo: ${{ github.ref_name }}
           distro: "ubuntu"
           release: "lunar"
           republish: "true" # needed ONLY if version is not changing

debian/changelog

@@ -1,3 +1,31 @@
+openhdimagewriter (2.0.2) stable; urgency=high
+
+ * add camera selection for about all boards
+
+ -- Raphael Scholle <[email protected]>  Sat, 02 Sep 2023 02:06:52 +0100
+openhdimagewriter (2.0.1) stable; urgency=high
+
+ * TODO
+
+ -- Raphael Scholle <[email protected]>  Sat, 02 Sep 2023 02:06:52 +0100
+openhdimagewriter (1.9.2) stable; urgency=high
+
+ * refactor a lot of settings to QSettings
+ * refactor all settings
+ * remove a few bugs with it
+
+ -- Raphael Scholle <[email protected]>  Sat, 02 Sep 2023 02:06:52 +0100
+openhdimagewriter (1.9.1) stable; urgency=high
+
+ * refactor a lot of settings to QSettings
+ * add wifi-hotspot
+ * add details page
+ * add camera-selection
+ * add wifi-hotspot
+ * add debug mode
+
+ -- Raphael Scholle <[email protected]>  Sat, 02 Sep 2023 02:06:52 +0100
+
 openhdimagewriter (1.9.0) stable; urgency=high
 
  * add bindphrase

debian/control

@@ -12,7 +12,7 @@ Package: openhdimagewriter
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, 
  qml-module-qtquick2, qml-module-qtquick-controls2, qml-module-qtquick-layouts, qml-module-qtquick-templates2, qml-module-qtquick-window2, qml-module-qtgraphicaleffects,
- dosfstools, fdisk 
+ dosfstools, fdisk, qml-module-qt-labs-settings
 Recommends: udisks2
 Description: OpenHD Image Writer
  Graphical user-interface to write disk images and format SD cards.

src/CMakeLists.txt

@@ -10,10 +10,10 @@ OPTION (ENABLE_CHECK_VERSION "Check for version updates" ON)
 OPTION (ENABLE_TELEMETRY "Enable sending telemetry" ON)
 
 project(OpenHDImageWriter LANGUAGES CXX C)
-set(IMAGER_VERSION_MAJOR 1)
-set(IMAGER_VERSION_MINOR 9)
-set(IMAGER_VERSION_STR "${IMAGER_VERSION_MAJOR}.${IMAGER_VERSION_MINOR}.0")
-set(IMAGER_VERSION_CSV "${IMAGER_VERSION_MAJOR},${IMAGER_VERSION_MINOR},0,0")
+set(IMAGER_VERSION_MAJOR 2)
+set(IMAGER_VERSION_MINOR 0)
+set(IMAGER_VERSION_STR "${IMAGER_VERSION_MAJOR}.${IMAGER_VERSION_MINOR}.2")
+set(IMAGER_VERSION_CSV "${IMAGER_VERSION_MAJOR},${IMAGER_VERSION_MINOR},2,0")
 add_definitions(-DIMAGER_VERSION_STR="${IMAGER_VERSION_STR}")
 add_definitions(-DIMAGER_VERSION_CSV=${IMAGER_VERSION_CSV})
 

src/MsgPopup.qml

@@ -21,6 +21,7 @@ Popup {
     property alias title: msgpopupheader.text
     property alias text: msgpopupbody.text
     property bool continueButton: true
+    property bool detailsButton: false
     property bool quitButton: false
     property bool yesButton: false
     property bool noButton: false
@@ -93,6 +94,19 @@ Popup {
             Layout.alignment: Qt.AlignCenter | Qt.AlignBottom
             spacing: 20
 
+
+            ImButton {
+                visible: msgpopup.detailsButton
+                text: qsTr("Details")
+                onClicked:{
+                   onClicked: {
+                   detailsPopup.visible = !detailsPopup.visible;
+                   }
+                }
+                Material.foreground: activeFocus ? "#d1dcfb" : "#ffffff"
+                Material.background: "#2C3E50"
+                }
+
             ImButton {
                 text: qsTr("NO")
                 onClicked: {
@@ -124,7 +138,6 @@ Popup {
                 Material.foreground: activeFocus ? "#d1dcfb" : "#ffffff"
                 Material.background: "#2C3E50"
             }
-
             ImButton {
                 text: qsTr("QUIT")
                 onClicked: {
@@ -138,22 +151,6 @@ Popup {
 
             Text { text: " " }
         }
-        RowLayout {
-            Layout.alignment: Qt.AlignLeft | Qt.AlignBottom
-            Layout.leftMargin: 20
-            Layout.bottomMargin: 10
-            Text {
-                id: changelog
-                text: "<a href='https://openhdfpv.org/changelogs'>changelogs</a>&nbsp;&nbsp;&nbsp; FIRST BOOT MAY TAKE UP TO 5 MINUTES! "
-                font.family: roboto.name
-                font.pointSize: 10
-                visible: msgpopup.continueButton
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: Qt.openUrlExternally("https://openhdfpv.org/changelogs")
-                }
-            }
-        }
     }
 
     function openPopup() {
@@ -162,3 +159,4 @@ Popup {
         msgpopupbody.forceActiveFocus()
     }
 }
+