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

Implemented AcquisitionFrameCount on Fake-camera #699

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
248 changes: 248 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,251 @@ build/
*~
build-*/
.cache/
install/

conanfile.txt
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/

# Visual Studio 2015 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

# NUNIT
*.VisualState.xml
TestResult.xml

# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c

# DNX
project.lock.json
artifacts/

*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc

# Chutzpah Test files
_Chutzpah*

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile

# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap

# TFS 2012 Local Workspace
$tf/

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding add-in
.JustCode

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*

# MightyMoose
*.mm.*
AutoTest.Net/

# Web workbench (sass)
.sass-cache/

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj

# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files
*.nuget.props
*.nuget.targets

# Microsoft Azure Build Output
csx/
*.build.csdef

# Microsoft Azure Emulator
ecf/
rcf/

# Windows Store app package directories and files
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt

# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/

# Others
ClientBin/
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.pfx
*.publishsettings
node_modules/
orleans.codegen.cs

# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
*.mdf
*.ldf

# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings

# Microsoft Fakes
FakesAssemblies/

# GhostDoc plugin setting file
*.GhostDoc.xml

# Node.js Tools for Visual Studio
.ntvs_analysis.dat

# Visual Studio 6 build log
*.plg

# Visual Studio 6 workspace options file
*.opt

# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions

# Paket dependency manager
.paket/paket.exe
paket-files/

# FAKE - F# Make
.fake/

# JetBrains Rider
.idea/
*.sln.iml
Comment on lines +6 to +253
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't include unrelated changes.

15 changes: 15 additions & 0 deletions src/arv-fake-camera.xml
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,21 @@
<Endianess>BigEndian</Endianess>
</IntReg>

<Integer Name="AcquisitionFrameCount" NameSpace="Custom">
<pValue>AcquisitionFrameCountRegister</pValue>
<Min>1</Min>
<Max>65535</Max>
</Integer>

<IntReg Name="AcquisitionFrameCountRegister" NameSpace="Custom">
<Address>0x310</Address>
<Length>4</Length>
Comment on lines +342 to +347
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use a 64bit integer, 65535 seems to small.

<AccessMode>RW</AccessMode>
<pPort>Device</pPort>
<Sign>Unsigned</Sign>
<Endianess>BigEndian</Endianess>
</IntReg>

<Enumeration Name="TriggerSelector" NameSpace="Standard">
<EnumEntry Name="FrameStart" NameSpace="Standard">
<Value>0</Value>
Expand Down
40 changes: 36 additions & 4 deletions src/arvfakecamera.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ typedef struct {

guint32 frame_id;
double trigger_frequency;
int frameSeqCount;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be multi_frame_count instead of frameSeqCount.


GMutex fill_pattern_mutex;

Expand Down Expand Up @@ -218,10 +219,20 @@ arv_fake_camera_get_sleep_time_for_next_frame (ArvFakeCamera *camera, guint64 *n

g_return_val_if_fail (ARV_IS_FAKE_CAMERA (camera), 0);

if (_get_register (camera, ARV_FAKE_CAMERA_REGISTER_TRIGGER_MODE) == 1)
if (_get_register (camera, ARV_FAKE_CAMERA_REGISTER_TRIGGER_MODE) == 1 &&
camera->priv->frameSeqCount >= _get_register (camera, ARV_FAKE_CAMERA_ACQUISITION_FRAME_COUNT)) {
frame_period_time_us = 1000000L / camera->priv->trigger_frequency;
else
frame_period_time_us = (guint64) _get_register (camera, ARV_FAKE_CAMERA_REGISTER_ACQUISITION_FRAME_PERIOD_US);

/*
//consider the time of the sequence inside the time between triggers?
frame_period_time_us -= _get_register(camera, ARV_FAKE_CAMERA_ACQUISITION_FRAME_COUNT) * _get_register (camera, ARV_FAKE_CAMERA_REGISTER_ACQUISITION_FRAME_PERIOD_US)
*/
}
else {
frame_period_time_us =
(guint64) _get_register (camera, ARV_FAKE_CAMERA_REGISTER_ACQUISITION_FRAME_PERIOD_US);
}


if (frame_period_time_us == 0) {
arv_warning_misc ("Invalid zero frame period, defaulting to 1 second");
Expand Down Expand Up @@ -866,9 +877,17 @@ arv_fake_camera_check_and_acknowledge_software_trigger (ArvFakeCamera *camera)


if (_get_register (camera, ARV_FAKE_CAMERA_REGISTER_TRIGGER_SOFTWARE) == 1) {

arv_fake_camera_write_register (camera, ARV_FAKE_CAMERA_REGISTER_TRIGGER_SOFTWARE, 0);
camera->priv->frameSeqCount = 1;
return TRUE;
}
} else if (camera->priv->frameSeqCount < _get_register (camera, ARV_FAKE_CAMERA_ACQUISITION_FRAME_COUNT)) {
camera->priv->frameSeqCount++;
if (camera->priv->frameSeqCount == _get_register (camera, ARV_FAKE_CAMERA_ACQUISITION_FRAME_COUNT)) {
camera->priv->frameSeqCount = 65535;
}
return TRUE;
}
return FALSE;
}

Expand Down Expand Up @@ -906,6 +925,18 @@ arv_fake_camera_get_control_channel_privilege (ArvFakeCamera *camera)
return value;
}

guint64
arv_fake_camera_get_frame_period(ArvFakeCamera* camera)
{
return _get_register (camera, ARV_FAKE_CAMERA_REGISTER_ACQUISITION_FRAME_PERIOD_US);
}

int
arv_fake_camera_get_acquisition_frame_count (ArvFakeCamera *camera)
{
return _get_register (camera, ARV_FAKE_CAMERA_ACQUISITION_FRAME_COUNT);
}

void
Comment on lines +928 to 940
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These functions are never used.

arv_fake_camera_set_control_channel_privilege (ArvFakeCamera *camera, guint32 privilege)
{
Expand Down Expand Up @@ -1074,6 +1105,7 @@ arv_fake_camera_init (ArvFakeCamera *fake_camera)

fake_camera->priv->trigger_frequency = 25.0;
fake_camera->priv->frame_id = 65400; /* Trigger circular counter bugs sooner */
fake_camera->priv->frameSeqCount = 65535;//max possible value by default for acquisition count
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't use C++ style comments

}

static void
Expand Down
4 changes: 4 additions & 0 deletions src/arvfakecamera.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ ARV_API void arv_set_fake_camera_genicam_filename (const char *filename);
#define ARV_FAKE_CAMERA_REGISTER_TRIGGER_SOURCE 0x304
#define ARV_FAKE_CAMERA_REGISTER_TRIGGER_ACTIVATION 0x308
#define ARV_FAKE_CAMERA_REGISTER_TRIGGER_SOFTWARE 0x30c
#define ARV_FAKE_CAMERA_ACQUISITION_FRAME_COUNT 0x310

#define ARV_FAKE_CAMERA_REGISTER_ACQUISITION 0x124
#define ARV_FAKE_CAMERA_REGISTER_EXPOSURE_TIME_US 0x120
Expand Down Expand Up @@ -123,6 +124,9 @@ ARV_API gboolean arv_fake_camera_is_in_free_running_mode (ArvFakeCamera *camera
ARV_API gboolean arv_fake_camera_is_in_software_trigger_mode (ArvFakeCamera *camera);
ARV_API gboolean arv_fake_camera_check_and_acknowledge_software_trigger (ArvFakeCamera *camera);

guint64 arv_fake_camera_get_frame_period (ArvFakeCamera *camera);
int arv_fake_camera_get_acquisition_frame_count (ArvFakeCamera *camera);

ARV_API const char * arv_fake_camera_get_genicam_xml (ArvFakeCamera *camera, size_t *size);

G_END_DECLS
Expand Down
Loading