Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Debug #5

Merged
merged 38 commits into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
84a5c71
Update README.md
raphaelscholle Mar 7, 2024
5205d73
fml just build this
raphaelscholle Mar 7, 2024
8b72558
Create ubuntu24.04.yml
raphaelscholle Mar 24, 2024
da697a9
build
raphaelscholle Mar 24, 2024
04335ed
Update drivelist.hpp
raphaelscholle Mar 24, 2024
d9dcb2f
Update ubuntu24.04.yml
raphaelscholle Mar 24, 2024
35952c1
Merge pull request #3 from OpenHD/debug
raphaelscholle Mar 24, 2024
1f03dfe
fix dependencies
raphaelscholle Apr 28, 2024
4d4e787
Update Windows.yml
raphaelscholle Apr 28, 2024
bf2b2e6
Update Windows.yml
raphaelscholle Apr 28, 2024
9ad31b3
Update Windows.yml
raphaelscholle Apr 28, 2024
70cb907
Update Windows.yml
raphaelscholle Apr 28, 2024
672c9f7
Update Windows.yml
raphaelscholle Apr 28, 2024
9b4affe
Update Windows.yml
raphaelscholle Apr 28, 2024
a3de196
Update Windows.yml
raphaelscholle Apr 28, 2024
480dd22
Update Windows.yml
raphaelscholle Apr 28, 2024
09d24d8
Update Windows.yml
raphaelscholle Apr 28, 2024
b1acca8
Update Windows.yml
raphaelscholle Apr 28, 2024
0a4aac4
Update Windows.yml
raphaelscholle Apr 28, 2024
52ebcee
Update Windows.yml
raphaelscholle Apr 28, 2024
047e234
Update Windows.yml
raphaelscholle Apr 28, 2024
bb7fd7c
Update Windows.yml
raphaelscholle Apr 28, 2024
53406ff
Update Windows.yml
raphaelscholle Apr 28, 2024
37215c2
Update Windows.yml
raphaelscholle Apr 29, 2024
831cfa5
Update Windows.yml
raphaelscholle Apr 29, 2024
3274901
Update Windows.yml
raphaelscholle Apr 29, 2024
eba53c5
Update Windows.yml
raphaelscholle Apr 29, 2024
5e14ce2
Update Windows.yml
raphaelscholle Apr 29, 2024
dd956b4
Update Windows.yml
raphaelscholle Apr 29, 2024
660986a
Update Windows.yml
raphaelscholle Apr 29, 2024
3be7f82
Update CMakeLists.txt
raphaelscholle Apr 29, 2024
f2845e8
Revert "Update CMakeLists.txt"
raphaelscholle Apr 29, 2024
725c88a
Update CMakeLists.txt
raphaelscholle Apr 29, 2024
3db8383
Revert "Update CMakeLists.txt"
raphaelscholle Apr 29, 2024
416b25d
not for production
raphaelscholle Apr 29, 2024
870df5b
add a developer mode
raphaelscholle Apr 30, 2024
181b49c
set developer mode
raphaelscholle Apr 30, 2024
f2a95e5
change version number, add normal user mode, indikate dev mode
raphaelscholle May 1, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions .github/workflows/Windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ name: OpenHD Image Writer Windows

on:
push:
branches:
branches:
- "2.5-evo"
- "dev-release"
- "release"
- "master"

paths-ignore:
- "debug"
paths-ignore:
- '**.md'
- '**.asciidoc'
- '**.adoc'
Expand All @@ -32,11 +31,13 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
aqtversion: '==3.1.*'
version: '5.15.2'
host: 'windows'
target: 'desktop'
arch: 'win32_mingw81'
aqtversion: ==3.1.*
host: windows
target: desktop
arch: win32_mingw81
setup-python: true
tools: 'tools_cmake'

- name: Install dependencies
run: |
Expand All @@ -45,21 +46,21 @@ jobs:
xcopy "C:\Program Files\OpenSSL" C:\files /E /I /Q
dir "C:\files"

- name: Configure CMake
run: |
cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -G "Unix Makefiles" -DOPENSSL_ROOT_DIR="C:\files" -DCMAKE_TOOLCHAIN_FILE="C:\Qt\${{env.QT_VERSION}}\${{env.QT_VERSION}}\mingw32\isystem.cmake"
# - name: Configure CMake
# run: |
# cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -G "Unix Makefiles" -DOPENSSL_ROOT_DIR="C:\files" -DCMAKE_TOOLCHAIN_FILE="C:\Qt\${{env.QT_VERSION}}\${{env.QT_VERSION}}\mingw32\isystem.cmake"

- name: Build
run: |
cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
cd ../build/
dir
makensis openhdimagewriter.nsi
mkdir -p build
cd build
cmake ../
cmake --build .
cmake --install .

- name: Upload to Github
uses: 'actions/upload-artifact@v3'
uses: actions/upload-artifact@v4
with:
name: "OpenHD Image Writer"
path: |
*.exe
path: '*.exe'
if-no-files-found: error
7 changes: 0 additions & 7 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,6 @@ on:
- "release"
- "master"

paths-ignore:
- '**.md'
- '**.asciidoc'
- '**.adoc'
- '.gitignore'
- 'LICENSE'

env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
BUILD_TYPE: Release
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/ubuntu20.04.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,6 @@ on:
- "release"
- "master"

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"
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/ubuntu22.04.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@ on:
- "dev-release"
- "release"
- "master"

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:
Expand Down
9 changes: 1 addition & 8 deletions .github/workflows/ubuntu23.04.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,7 @@ on:
branches:
- "2.5-evo"
- "dev-release"
- "master"

paths-ignore:
- '**.md'
- '**.asciidoc'
- '**.adoc'
- '.gitignore'
- 'LICENSE'
- "release"

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
Expand Down
66 changes: 66 additions & 0 deletions .github/workflows/ubuntu24.04.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# This is a basic workflow to help you get started with Actions

name: OpenHD Image Writer noble

# Controls when the workflow will run
on:
push:
branches:
- "debug"
- "dev-release"
- "release"

# 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
container:
image: docker://ubuntu:noble

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: initialise
run: |
echo "DT=$(date +'%Y-%m-%d_%H%M')" >> $GITHUB_ENV
echo "BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
apt update
apt install -y git sudo

# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3

# 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@v3'
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: "noble"
republish: "true" # needed ONLY if version is not changing
file: "*.deb"
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build*
build-src*
server/os_list_imagingutility_v3.json
CMakeCache.txt
*.tlog
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# OpenHD ImageWriter


OpenHD ImageWriter

The OpenHD ImageWriter is an image flashing untillity based on https://github.com/raspberrypi/rpi-imager/
Expand Down
4 changes: 4 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
openhdimagewriter (2.0.3) stable; urgency=high

* add developer mode

openhdimagewriter (2.0.2) stable; urgency=high

* add camera selection for about all boards
Expand Down
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ OPTION (ENABLE_TELEMETRY "Enable sending telemetry" ON)
project(OpenHDImageWriter LANGUAGES CXX C)
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")
set(IMAGER_VERSION_STR "${IMAGER_VERSION_MAJOR}.${IMAGER_VERSION_MINOR}.3")
set(IMAGER_VERSION_CSV "${IMAGER_VERSION_MAJOR},${IMAGER_VERSION_MINOR},3,0")
add_definitions(-DIMAGER_VERSION_STR="${IMAGER_VERSION_STR}")
add_definitions(-DIMAGER_VERSION_CSV=${IMAGER_VERSION_CSV})

Expand Down
31 changes: 28 additions & 3 deletions src/OptionsPopup.qml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ Popup {
property bool rpi
property bool useSettings:true




// background of title
Rectangle {
color: "#f5f5f5"
Expand Down Expand Up @@ -379,6 +376,34 @@ Popup {
}
}

TextField {
id: textField
visible: imageWriter.getValue("developer") !== "Kugelrund"
onTextChanged: {
saveButton.visible = text === "Kugelrund";
}
}

Button {
id: saveButton
text: "Use Dev Images"
visible: false
onClicked: {
imageWriter.setSetting("developer","Kugelrund");
imageWriter.makeDeveloper();
}
}

Button {
id: userButton
text: "Use Normal Images"
visible: imageWriter.getValue("developer") == "Kugelrund"
onClicked: {
imageWriter.setSetting("developer","");
imageWriter.makeUser();
}
}

ImCheckBox {
id: setWifiHotspot
visible: false
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# ===========================================================================
# http://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html
# ===========================================================================
#
# SYNOPSIS
#
# AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT])
#
# DESCRIPTION
#
# For every FLAG1, FLAG2 it is checked whether the compiler works with the
# flag. If it does, the flag is added FLAGS-VARIABLE
#
# If FLAGS-VARIABLE is not specified, the current language's flags (e.g.
# CFLAGS) is used. During the check the flag is always added to the
# current language's flags.
#
# If EXTRA-FLAGS is defined, it is added to the current language's default
# flags (e.g. CFLAGS) when the check is done. The check is thus made with
# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
# force the compiler to issue an error when a bad flag is given.
#
# INPUT gives an alternative input source to AC_COMPILE_IFELSE.
#
# NOTE: This macro depends on the AX_APPEND_FLAG and
# AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with
# AX_APPEND_LINK_FLAGS.
#
# LICENSE
#
# Copyright (c) 2011 Maarten Bosmans <[email protected]>
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation, either version 3 of the License, or (at your
# option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
#
# As a special exception, the respective Autoconf Macro's copyright owner
# gives unlimited permission to copy, distribute and modify the configure
# scripts that are the output of Autoconf when processing the Macro. You
# need not follow the terms of the GNU General Public License when using
# or distributing such scripts, even though portions of the text of the
# Macro appear in them. The GNU General Public License (GPL) does govern
# all other use of the material that constitutes the Autoconf Macro.
#
# This special exception to the GPL applies to versions of the Autoconf
# Macro released by the Autoconf Archive. When you make and distribute a
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.

#serial 5

AC_DEFUN([AX_APPEND_COMPILE_FLAGS],
[AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
for flag in $1; do
AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3], [$4])
done
])dnl AX_APPEND_COMPILE_FLAGS
Loading
Loading