Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Raptor Engineering Public Development
dsview
Commits
63772095
Commit
63772095
authored
Oct 08, 2015
by
DreamSourceLab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add warning message when buffer full @ LA RLE mode
parent
d0dcc013
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
0 deletions
+33
-0
DSView/pv/mainwindow.cpp
DSView/pv/mainwindow.cpp
+19
-0
libsigrok4DSL/hardware/DSL/dslogic.c
libsigrok4DSL/hardware/DSL/dslogic.c
+7
-0
libsigrok4DSL/hwdriver.c
libsigrok4DSL/hwdriver.c
+2
-0
libsigrok4DSL/libsigrok.h
libsigrok4DSL/libsigrok.h
+5
-0
No files found.
DSView/pv/mainwindow.cpp
View file @
63772095
...
...
@@ -486,6 +486,25 @@ void MainWindow::capture_state_changed(int state)
_sampling_bar
->
enable_toggle
(
state
!=
SigSession
::
Running
);
_trig_bar
->
enable_toggle
(
state
!=
SigSession
::
Running
);
_measure_dock
->
widget
()
->
setEnabled
(
state
!=
SigSession
::
Running
);
if
(
_session
.
get_device
()
->
dev_inst
()
->
mode
==
LOGIC
&&
state
==
SigSession
::
Stopped
)
{
GVariant
*
gvar
=
_session
.
get_device
()
->
get_config
(
NULL
,
NULL
,
SR_CONF_RLE
);
if
(
gvar
!=
NULL
)
{
bool
rle
=
g_variant_get_boolean
(
gvar
);
g_variant_unref
(
gvar
);
if
(
rle
)
{
gvar
=
_session
.
get_device
()
->
get_config
(
NULL
,
NULL
,
SR_CONF_ACTUAL_SAMPLES
);
if
(
gvar
!=
NULL
)
{
uint64_t
actual_samples
=
g_variant_get_uint64
(
gvar
);
g_variant_unref
(
gvar
);
if
(
actual_samples
!=
_session
.
get_device
()
->
get_sample_limit
())
{
show_session_error
(
tr
(
"RLE Mode Warning"
),
tr
(
"Hardware buffer is full!
\n
Actually received samples is less than setted sample depth!"
));
}
}
}
}
}
#ifdef TEST_MODE
if
(
state
==
SigSession
::
Stopped
)
{
test_timer
.
start
(
100
);
...
...
libsigrok4DSL/hardware/DSL/dslogic.c
View file @
63772095
...
...
@@ -1196,6 +1196,12 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
devc
=
sdi
->
priv
;
*
data
=
g_variant_new_uint64
(
devc
->
limit_samples
);
break
;
case
SR_CONF_ACTUAL_SAMPLES
:
if
(
!
sdi
)
return
SR_ERR
;
devc
=
sdi
->
priv
;
*
data
=
g_variant_new_uint64
(
devc
->
actual_samples
);
break
;
case
SR_CONF_SAMPLERATE
:
if
(
!
sdi
)
return
SR_ERR
;
...
...
@@ -2530,6 +2536,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
devc
->
status
=
DSL_INIT
;
devc
->
num_transfers
=
0
;
devc
->
submitted_transfers
=
0
;
devc
->
actual_samples
=
devc
->
limit_samples
;
/* Configures devc->trigger_* and devc->sample_wide */
if
(
configure_probes
(
sdi
)
!=
SR_OK
)
{
...
...
libsigrok4DSL/hwdriver.c
View file @
63772095
...
...
@@ -59,6 +59,8 @@ static struct sr_config_info sr_config_info_data[] = {
"Sample rate"
,
"Sample rate"
,
NULL
},
{
SR_CONF_LIMIT_SAMPLES
,
SR_T_UINT64
,
"samplecount"
,
"Sample count"
,
"Sample count"
,
NULL
},
{
SR_CONF_ACTUAL_SAMPLES
,
SR_T_UINT64
,
"samplecount"
,
"Sample count"
,
"Sample count"
,
NULL
},
{
SR_CONF_CLOCK_TYPE
,
SR_T_BOOL
,
"clocktype"
,
"Using External Clock"
,
"Using External Clock"
,
NULL
},
{
SR_CONF_CLOCK_EDGE
,
SR_T_BOOL
,
"clockedge"
,
...
...
libsigrok4DSL/libsigrok.h
View file @
63772095
...
...
@@ -856,6 +856,11 @@ enum {
*/
SR_CONF_LIMIT_SAMPLES
,
/**
* The actual sample count received
*/
SR_CONF_ACTUAL_SAMPLES
,
/**
* The device supports setting a frame limit (how many
* frames should be acquired).
...
...
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