Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Raptor Engineering Public Development
dsview
Commits
9af32655
Commit
9af32655
authored
5 years ago
by
DreamSourceLab
Browse files
Options
Download
Email Patches
Plain Diff
Fix some compile warnings
parent
57b3f0ce
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
12 additions
and
8 deletions
+12
-8
DSView/pv/data/decode/decoder.h
DSView/pv/data/decode/decoder.h
+3
-0
DSView/pv/data/signaldata.cpp
DSView/pv/data/signaldata.cpp
+2
-0
DSView/pv/data/signaldata.h
DSView/pv/data/signaldata.h
+1
-1
DSView/pv/dialogs/calibration.cpp
DSView/pv/dialogs/calibration.cpp
+1
-1
DSView/pv/view/xcursor.cpp
DSView/pv/view/xcursor.cpp
+1
-1
libsigrok4DSL/hardware/DSL/dscope.c
libsigrok4DSL/hardware/DSL/dscope.c
+2
-2
libsigrok4DSL/libsigrok.h
libsigrok4DSL/libsigrok.h
+1
-2
libsigrok4DSL/output/srzip.c
libsigrok4DSL/output/srzip.c
+1
-1
No files found.
DSView/pv/data/decode/decoder.h
View file @
9af32655
...
...
@@ -24,6 +24,9 @@
#include <map>
#include <set>
#include <string>
#include <sstream>
#include <iostream>
#include <boost/shared_ptr.hpp>
...
...
This diff is collapsed.
Click to expand it.
DSView/pv/data/signaldata.cpp
View file @
9af32655
...
...
@@ -32,6 +32,8 @@ SignalData::SignalData() :
{
}
SignalData
::~
SignalData
()
{}
double
SignalData
::
samplerate
()
const
{
return
_samplerate
;
...
...
This diff is collapsed.
Click to expand it.
DSView/pv/data/signaldata.h
View file @
9af32655
...
...
@@ -34,7 +34,7 @@ class SignalData
{
public:
SignalData
();
virtual
~
SignalData
()
=
0
;
public:
double
samplerate
()
const
;
void
set_samplerate
(
double
samplerate
);
...
...
This diff is collapsed.
Click to expand it.
DSView/pv/dialogs/calibration.cpp
View file @
9af32655
...
...
@@ -45,7 +45,7 @@ const QString Calibration::VCOMB = QT_TR_NOOP(" VCOMB");
Calibration
::
Calibration
(
QWidget
*
parent
)
:
DSDialog
(
parent
)
{
#ifdef Q_OS_
OSX
#ifdef Q_OS_
DARWIN
Qt
::
WindowFlags
flags
=
windowFlags
();
this
->
setWindowFlags
(
flags
|
Qt
::
Tool
);
#endif
...
...
This diff is collapsed.
Click to expand it.
DSView/pv/view/xcursor.cpp
View file @
9af32655
...
...
@@ -50,7 +50,7 @@ XCursor::XCursor(View &view, QColor &colour,
const
std
::
vector
<
boost
::
shared_ptr
<
Signal
>
>
sigs
(
_view
.
session
().
get_signals
());
BOOST_FOREACH
(
const
boost
::
shared_ptr
<
Signal
>
s
,
sigs
)
{
boost
::
shared_ptr
<
DsoSignal
>
dsoSig
;
if
(
dsoSig
=
dynamic_pointer_cast
<
DsoSignal
>
(
s
))
if
(
(
dsoSig
=
dynamic_pointer_cast
<
DsoSignal
>
(
s
))
)
if
(
dsoSig
->
enabled
())
{
_dsoSig
=
dsoSig
;
break
;
...
...
This diff is collapsed.
Click to expand it.
libsigrok4DSL/hardware/DSL/dscope.c
View file @
9af32655
...
...
@@ -1733,13 +1733,13 @@ static int dso_tune(const struct sr_dev_inst *sdi)
else
margin
-=
(
devc
->
mstatus
.
ch1_acc_mean
*
1
.
0
/
devc
->
limit_samples
);
if
((
devc
->
tune_probe
->
coupling
==
SR_AC_COUPLING
)
&&
(
abs
(
margin
)
<
0
.
5
))
{
if
((
devc
->
tune_probe
->
coupling
==
SR_AC_COUPLING
)
&&
(
f
abs
(
margin
)
<
0
.
5
))
{
devc
->
tune_probe
->
coupling
=
SR_DC_COUPLING
;
ret
=
dsl_wr_dso
(
sdi
,
dso_cmd_gen
(
sdi
,
devc
->
tune_probe
,
SR_CONF_PROBE_COUPLING
));
}
else
if
(
devc
->
tune_probe
->
coupling
==
SR_AC_COUPLING
){
(
devc
->
tune_probe
->
vga_ptr
+
devc
->
tune_stage
)
->
preoff
+=
margin
;
ret
=
dsl_wr_dso
(
sdi
,
dso_cmd_gen
(
sdi
,
devc
->
tune_probe
,
SR_CONF_PROBE_OFFSET
));
}
else
if
((
devc
->
tune_probe
->
coupling
==
SR_DC_COUPLING
)
&&
(
abs
(
margin
)
<
0
.
5
))
{
}
else
if
((
devc
->
tune_probe
->
coupling
==
SR_DC_COUPLING
)
&&
(
f
abs
(
margin
)
<
0
.
5
))
{
devc
->
tune_stage
++
;
if
(
devc
->
profile
->
dev_caps
.
vdivs
[
devc
->
tune_stage
]
!=
0
)
{
ret
=
dsl_wr_ext
(
sdi
,
0x01
,
mux
[
devc
->
tune_stage
]);
...
...
This diff is collapsed.
Click to expand it.
libsigrok4DSL/libsigrok.h
View file @
9af32655
...
...
@@ -1223,8 +1223,7 @@ struct sr_session {
GSList
*
devs
;
/** List of struct datafeed_callback pointers. */
GSList
*
datafeed_callbacks
;
GTimeVal
starttime
;
gboolean
running
;
gboolean
running
;
unsigned
int
num_sources
;
...
...
This diff is collapsed.
Click to expand it.
libsigrok4DSL/output/srzip.c
View file @
9af32655
...
...
@@ -299,7 +299,7 @@ static int cleanup(struct sr_output *o)
static
struct
sr_option
options
[]
=
{
{
"filename"
,
"Filename"
,
"File to write"
,
NULL
,
NULL
},
{
0
}
{
0
,
0
,
0
,
0
,
0
}
};
static
const
struct
sr_option
*
get_options
(
void
)
...
...
This diff is collapsed.
Click to expand it.
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