Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
Beam Positoning Monitor - Software
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
Beam Positoning Monitor - Software
Commits
9364384c
Commit
9364384c
authored
May 20, 2016
by
Lucas Russo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sm_io/*/acq/*: fix maximum number of samples in multishot mode
parent
55025b71
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
sm_io_acq_exp.c
src/sm_io/modules/acq/sm_io_acq_exp.c
+4
-2
No files found.
src/sm_io/modules/acq/sm_io_acq_exp.c
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
)
&&
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment