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
a76c4b4a
Commit
a76c4b4a
authored
11 years ago
by
DreamSourceLab
Browse files
Options
Download
Email Patches
Plain Diff
minor update for compiling on linux machine
parent
493d61d6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
DSLogic-gui/CMakeLists.txt
DSLogic-gui/CMakeLists.txt
+1
-1
DSLogic-gui/pv/decoder/dsserial.cpp
DSLogic-gui/pv/decoder/dsserial.cpp
+2
-2
DSLogic-gui/pv/sigsession.cpp
DSLogic-gui/pv/sigsession.cpp
+1
-1
DSLogic-gui/pv/toolbars/samplingbar.cpp
DSLogic-gui/pv/toolbars/samplingbar.cpp
+2
-2
No files found.
DSLogic-gui/CMakeLists.txt
View file @
a76c4b4a
...
...
@@ -28,7 +28,7 @@ project(DSLogic-gui)
#= User Options
#-------------------------------------------------------------------------------
option
(
DISABLE_WERROR
"Build without -Werror"
FALS
E
)
option
(
DISABLE_WERROR
"Build without -Werror"
TRU
E
)
option
(
ENABLE_SIGNALS
"Build with UNIX signals"
TRUE
)
option
(
ENABLE_TESTS
"Enable unit tests"
FALSE
)
option
(
STATIC_PKGDEPS_LIBS
"Statically link to (pkgconfig) libraries"
FALSE
)
...
...
This diff is collapsed.
Click to expand it.
DSLogic-gui/pv/decoder/dsserial.cpp
View file @
a76c4b4a
...
...
@@ -117,7 +117,7 @@ void dsSerial::decode()
uint64_t
left
=
0
;
uint64_t
right
=
snapshot
->
get_sample_count
()
-
1
;
float
samplesPerBit
;
int
sampleOffset
;
//
int sampleOffset;
int
i
;
_max_width
=
0
;
_min_width
=
right
;
...
...
@@ -127,7 +127,7 @@ void dsSerial::decode()
samplesPerBit
=
_data
->
get_samplerate
()
*
1.0
f
/
_baudrate
;
else
samplesPerBit
=
snapshot
->
get_min_pulse
(
left
,
right
,
_serial_index
);
sampleOffset
=
samplesPerBit
/
2
;
//
sampleOffset = samplesPerBit / 2;
if
(
!
_state_index
.
empty
())
_state_index
.
clear
();
...
...
This diff is collapsed.
Click to expand it.
DSLogic-gui/pv/sigsession.cpp
View file @
a76c4b4a
...
...
@@ -992,7 +992,7 @@ void SigSession::rst_protocol_analyzer(int rst_index, std::list <int > _sel_prob
void
SigSession
::
del_protocol_analyzer
(
int
protocol_index
)
{
assert
(
protocol_index
<
_decoders
.
size
());
delete
(
_decoders
.
at
(
protocol_index
)).
first
;
//
delete (_decoders.at(protocol_index)).first;
// BOOST_FOREACH(const int _index, (_decoders.at(protocol_index)).second) {
// _signals.at(_index)->del_decoder();
...
...
This diff is collapsed.
Click to expand it.
DSLogic-gui/pv/toolbars/samplingbar.cpp
View file @
a76c4b4a
...
...
@@ -174,7 +174,7 @@ void SamplingBar::update_sample_rate_selector()
GVariant
*
gvar_dict
,
*
gvar_list
;
const
uint64_t
*
elements
=
NULL
;
gsize
num_elements
;
QAction
*
selector_action
=
NULL
;
//
QAction *selector_action = NULL;
assert
(
_sample_rate_list_action
);
...
...
@@ -205,7 +205,7 @@ void SamplingBar::update_sample_rate_selector()
_sample_rate_list
.
show
();
g_variant_unref
(
gvar_list
);
selector_action
=
_sample_rate_list_action
;
//
selector_action = _sample_rate_list_action;
}
g_variant_unref
(
gvar_dict
);
...
...
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