Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AWG control
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
Show more breadcrumbs
whuie2
AWG control
Commits
99c44884
Commit
99c44884
authored
1 year ago
by
whooie
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of
https://gitlab.engr.illinois.edu/whuie2/awg-control
didn't pull before pushing
parents
c61643c4
9d40fdba
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Cpp/lib/waveform.cpp
+1
-1
1 addition, 1 deletion
Cpp/lib/waveform.cpp
Cpp/src/example.cpp
+1
-1
1 addition, 1 deletion
Cpp/src/example.cpp
with
2 additions
and
2 deletions
Cpp/lib/waveform.cpp
+
1
−
1
View file @
99c44884
...
@@ -199,7 +199,7 @@ void ArrayWaveform::bindBuffer(int64_t bytes) {
...
@@ -199,7 +199,7 @@ void ArrayWaveform::bindBuffer(int64_t bytes) {
void
ArrayWaveform
::
unbindBuffer
()
{
void
ArrayWaveform
::
unbindBuffer
()
{
if
(
this
->
dataLen
!=
0
and
this
->
pDataBuffer
!=
nullptr
)
{
if
(
this
->
dataLen
!=
0
and
this
->
pDataBuffer
!=
nullptr
)
{
munmap
(
this
->
pDataBuffer
,
this
->
dataLen
);
munmap
(
this
->
pDataBuffer
,
this
->
dataLen
*
2
);
this
->
pDataBuffer
=
nullptr
;
this
->
pDataBuffer
=
nullptr
;
this
->
dataLen
=
0
;
this
->
dataLen
=
0
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Cpp/src/example.cpp
+
1
−
1
View file @
99c44884
...
@@ -51,7 +51,7 @@ int main() {
...
@@ -51,7 +51,7 @@ int main() {
awg
.
writeSeqModeSegment
(
awg
.
writeSeqModeSegment
(
1
,
1
,
wfmData
.
first
,
wfmData
.
first
,
wfmData
.
second
wfmData
.
second
*
2
);
// load wfms onto both memory segements for simplicity,
);
// load wfms onto both memory segements for simplicity,
// a memory segment needs only be initialized with data
// a memory segment needs only be initialized with data
// if it is configured as part of the step sequence below
// if it is configured as part of the step sequence below
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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