Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
EmmanuelP authored Jan 9, 2023
2 parents aed72ff + f06f366 commit 2165d50
Show file tree
Hide file tree
Showing 49 changed files with 1,153 additions and 415 deletions.
19 changes: 0 additions & 19 deletions .clang-format

This file was deleted.

4 changes: 0 additions & 4 deletions .clang-format-include

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/aravis-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
run: |
pip3 install meson ninja Markdown toml typogrify
sudo apt update
sudo apt install python3 libusb-1.0-0-dev gobject-introspection valgrind libgstreamer-plugins-bad1.0-dev libgtk-3-dev libgirepository1.0-dev python3-gi
sudo apt install python3 libusb-1.0-0-dev gobject-introspection valgrind libgstreamer-plugins-bad1.0-dev libgtk-3-dev libgirepository1.0-dev python3-gi libunwind-dev gettext
- name: Build
run: |
meson --buildtype=plain -Ddocumentation=enabled -Dgst-plugin=enabled -Dintrospection=enabled -Dusb=disabled -Dviewer=enabled . ./build
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/aravis-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,15 @@ jobs:
- uses: actions/setup-python@v2
with:
python-version: '3.x'
- name: Unbreak Python in Github Actions
run: |
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
sudo rm -rf /Library/Frameworks/Python.framework/
brew install --force python3 && brew unlink python3 && brew unlink python3 && brew link --overwrite python3
- name: Install dependencies
run: |
pip install meson ninja
brew update
brew install gcc gettext intltool gtk-doc libxml2 libusb gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gnome-icon-theme gobject-introspection glib-utils
brew install meson ninja gcc gettext intltool libxml2 libusb gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gnome-icon-theme gobject-introspection glib
- name: Build
run: |
meson --buildtype=plain -Ddocumentation=disabled -Dgst-plugin=enabled -Dintrospection=disabled -Dusb=enabled -Dviewer=enabled . ./build
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/aravis-msvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,28 @@ jobs:
- name: pip
run: |
pip install conan
- name: disable-perl
run: |
rm -r C:\Strawberry\perl
- name: checkout
uses: actions/checkout@v2
- name: conan
env:
INPUT_CONANFILE: |
[requires]
libiconv/1.17
glib/2.70.0
glib/2.74.1
#gobject-introspection/1.69.0
#gstreamer/1.19.1
#gst-plugins-base/1.19.1
gstreamer/1.19.2
gst-plugins-base/1.19.2
#gtk/4.4.0
libxml2/2.9.12
zlib/1.2.11
libusb/1.0.24
libxml2/2.10.3
zlib/1.2.13
libusb/1.0.26
[build_requires]
meson/0.59.2
pkgconf/1.9.3
[generators]
pkg_config
Expand All @@ -60,7 +64,7 @@ jobs:
.\build\activate_build.ps1
.\build\activate_run.ps1
echo "::group::configure"
meson --prefix ${{ github.workspace }}\install --buildtype ${{ matrix.build_type_meson }} --pkg-config-path ${{ github.workspace }}\build -Ddocumentation=disabled -Dgst-plugin=disabled -Dintrospection=disabled -Dusb=enabled -Dviewer=disabled -Dgv-n-buffers=1 . .\build
meson --prefix ${{ github.workspace }}\install --buildtype ${{ matrix.build_type_meson }} --pkg-config-path ${{ github.workspace }}\build -Ddocumentation=disabled -Dgst-plugin=enabled -Dintrospection=disabled -Dusb=enabled -Dviewer=disabled -Dgv-n-buffers=1 . .\build
echo "::endgroup::"
echo "::group::compile"
meson compile -C .\build -v
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ build/
*~
build-*/
.cache/
.vscode/
52 changes: 0 additions & 52 deletions .travis.yml

This file was deleted.

2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
Aravis
</h1>

<p align="center"><strong>Your industrial vision library</strong></p>

[![Aravis-Linux](https://github.com/AravisProject/aravis/actions/workflows/aravis-linux.yml/badge.svg)](https://github.com/AravisProject/aravis/actions/workflows/aravis-linux.yml)
[![Aravis-macOS](https://github.com/AravisProject/aravis/actions/workflows/aravis-macos.yml/badge.svg)](https://github.com/AravisProject/aravis/actions/workflows/aravis-macos.yml)
[![Aravis-MinGW](https://github.com/AravisProject/aravis/actions/workflows/aravis-mingw.yml/badge.svg)](https://github.com/AravisProject/aravis/actions/workflows/aravis-mingw.yml)
Expand Down
116 changes: 116 additions & 0 deletions docs/arv-camera-test-0.8.1
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH ARV-CAMERA-TEST-0.8 "1" "décembre 2022" "arv-camera-test-0.8 0.8.23" "User Commands"
.SH NAME
arv-camera-test-0.8 \- manual page for arv-camera-test-0.8 0.8.23
.SH DESCRIPTION
.SS "Usage:"
.IP
arv\-camera\-test\-0.8 [OPTION?]
.PP
Small utility for basic device checks.
.SS "Help Options:"
.TP
\-?, \fB\-\-help\fR
Show help options
.SS "Application Options:"
.TP
\fB\-n\fR, \fB\-\-name=\fR<camera_id>
Camera name
.TP
\fB\-f\fR, \fB\-\-frequency=\fR<Hz>
Acquisition frequency
.TP
\fB\-t\fR, \fB\-\-trigger=\fR<trigger_id>
External trigger
.TP
\fB\-o\fR, \fB\-\-software\-trigger=\fR<Hz>
Emit software trigger
.TP
\fB\-w\fR, \fB\-\-width=\fR<n_pixels>
Width
.TP
\fB\-h\fR, \fB\-\-height=\fR<n_pixels>
Height
.TP
\fB\-\-h\-binning=\fR<n_pixels>
Horizontal binning
.TP
\fB\-\-v\-binning=\fR<n_pixels>
Vertical binning
.TP
\fB\-e\fR, \fB\-\-exposure=\fR<time_us>
Exposure time
.TP
\fB\-g\fR, \fB\-\-gain=\fR<dB>
Gain (dB)
.TP
\fB\-a\fR, \fB\-\-auto\fR
Auto socket buffer size
.TP
\fB\-\-features\fR
Additional configuration as a space separated list of features
.TP
\fB\-j\fR, \fB\-\-packet\-size\-adjustment=\fR{never|always|once|on\-failure|on\-failure\-once}
Packet size adjustment
.TP
\fB\-r\fR, \fB\-\-no\-packet\-resend\fR
No packet resend
.TP
\fB\-q\fR, \fB\-\-packet\-request\-ratio\fR=\fI\,[0\/\fR..2.0]
Packet resend request limit as a frame packet ratio
.TP
\fB\-l\fR, \fB\-\-initial\-packet\-timeout=\fR<ms>
Initial packet timeout
.TP
\fB\-p\fR, \fB\-\-packet\-timeout=\fR<ms>
Packet timeout
.TP
\fB\-m\fR, \fB\-\-frame\-retention=\fR<ms>
Frame retention
.TP
\fB\-c\fR, \fB\-\-gv\-stream\-channel=\fR<id>
GigEVision stream channel id
.TP
\fB\-y\fR, \fB\-\-gv\-packet\-delay=\fR<ns>
GigEVision packet delay
.TP
\fB\-i\fR, \fB\-\-gv\-packet\-size=\fR<n_bytes>
GigEVision packet size
.TP
\fB\-s\fR, \fB\-\-usb\-mode=\fR{sync|async}
USB device I/O mode
.TP
\fB\-u\fR, \fB\-\-chunks=\fR<chunk_id>[,<chunk_id>[...]]
Chunks
.TP
\fB\-\-realtime\fR
Make stream thread realtime
.TP
\fB\-\-high\-priority\fR
Make stream thread high priority
.TP
\fB\-\-no\-packet\-socket\fR
Disable use of packet socket
.TP
\fB\-\-register\-cache=\fR{disable|enable|debug}
Register cache policy
.TP
\fB\-\-range\-check=\fR{disable|enable|debug}
Range check policy
.TP
\fB\-\-access\-check=\fR{disable|enable}
Feature access check policy
.TP
\fB\-b\fR, \fB\-\-bandwidth\-limit=\fR<limit>
Desired USB3 Vision device bandwidth limit
.TP
\fB\-\-duration=\fR<s>
Test duration (s)
.TP
\fB\-d\fR, \fB\-\-debug=\fR{<category>[:<level>][,...]|help}
Debug output selection
.TP
\fB\-v\fR, \fB\-\-version\fR
Show version
.PP
This tool configures a camera and starts video streaming, infinitely unless a duration is given.
48 changes: 48 additions & 0 deletions docs/arv-test-0.8.1
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH ARV-TEST-0.8 "1" "décembre 2022" "arv-test-0.8 0.8.23" "User Commands"
.SH NAME
arv-test-0.8 \- manual page for arv-test-0.8 0.8.23
.SH DESCRIPTION
.SS "Usage:"
.IP
arv\-test\-0.8 [OPTION?]
.PP
Automated test utillity.
.SS "Help Options:"
.TP
\fB\-h\fR, \fB\-\-help\fR
Show help options
.SS "Application Options:"
.TP
\fB\-n\fR, \fB\-\-name=\fR<pattern>
Device selection
.TP
\fB\-t\fR, \fB\-\-test=\fR<pattern>
Test selection
.TP
\fB\-c\fR, \fB\-\-configuration=\fR<path>
Alternative configuration
.TP
\fB\-i\fR, \fB\-\-iterations=\fR<n_iter>
Number of test repetitions
.TP
\fB\-s\fR, \fB\-\-usb\-mode=\fR{sync|async}
USB device I/O mode
.TP
\fB\-a\fR, \fB\-\-cache\-check\fR
Register cache check
.TP
\fB\-\-packet\-socket\fR
Enable use of packet socket
.HP
\fB\-d\fR, \fB\-\-debug=\fR{<category>[:<level>][,...]|help}
.TP
\fB\-v\fR, \fB\-\-version\fR
Show version
.PP
arv\-test is an automated test utility that tries to exercise most of the
Aravis functionalities. By default it runs all the tests on all the detected
devices, but devices and tests can be selected using a glob pattern.
.PP
A default configuration file is bundled in the executable. An alternative
one with entries specific to the camera you want to test can be specified.
Loading

0 comments on commit 2165d50

Please sign in to comment.