Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
Beam Positoning Monitor - Software
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Projects
Beam Positoning Monitor - Software
Commits
9364384c
Commit
9364384c
authored
8 years ago
by
Lucas Russo
Browse files
Options
Downloads
Patches
Plain Diff
sm_io/*/acq/*: fix maximum number of samples in multishot mode
parent
55025b71
Branches
trig-rcv
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/sm_io/modules/acq/sm_io_acq_exp.c
+4
-2
4 additions, 2 deletions
src/sm_io/modules/acq/sm_io_acq_exp.c
with
4 additions
and
2 deletions
src/sm_io/modules/acq/sm_io_acq_exp.c
+
4
−
2
View file @
9364384c
...
...
@@ -114,8 +114,10 @@ static int _acq_data_acquire (void *owner, void *args, void *ret)
return
-
ACQ_NUM_CHAN_OOR
;
}
/* number of samples required is out of the maximum limit */
uint32_t
max_samples_multishot
=
ACQ_CORE_MULTISHOT_MEM_SIZE
/
acq
->
acq_buf
[
chan
].
sample_size
;
/* number of samples required is out of the maximum limit. Maixmum number of samples
* in multishot mode is simply the maximum number of samples of the DPRAM. The DPRAM
* size is calculated to fit the largest sample in the design, so we are safe. */
uint32_t
max_samples_multishot
=
ACQ_CORE_MULTISHOT_MEM_SIZE
;
if
(((
num_shots
==
ACQ_CORE_MIN_NUM_SHOTS
)
&&
(
num_samples_pre
+
num_samples_post
>
acq
->
acq_buf
[
chan
].
max_samples
))
||
((
num_shots
>
ACQ_CORE_MIN_NUM_SHOTS
)
&&
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment