Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Achim Morschhauser
GeomagLogger
Commits
f9e32a76
Commit
f9e32a76
authored
Nov 12, 2018
by
Achim Morschhauser
Browse files
ADC calibrate
#3
parent
1188d60c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Makefile.dynamic
View file @
f9e32a76
...
...
@@ -23,13 +23,13 @@ EXCL=driver_serial_emulate.o
.SECONDARY
:
all
:
$(USR_TARGET:%=$(BIN_DIR)%)
all
:
$(USR_TARGET:%=$(BIN_DIR)%)
$(LIB_DIR)libLogger.so
%
:
$(BIN_DIR)%
@
echo
----
DONE
----
$(BIN_DIR)%
:
$(USR_DIR)%.cpp
$(LIB_DIR)libLogger.so
$(BIN_DIR)%
:
$(USR_DIR)%.cpp
$(CC)
$(CCFLAGS)
-no-pie
$<
-o
$@
-I
$(HDR_DIR)
-L
$(LIB_DIR)
-Wl
,-rpath,
"
\$
$ORIGIN
/../
$(LIB_DIR)
"
-lLogger
# $(CC) $(CCFLAGS) $< -o $@ -I$(HDR_DIR) -L$(LIB_DIR) -lLogger
...
...
src/driver_obs_obsdaq.cpp
View file @
f9e32a76
...
...
@@ -1047,7 +1047,7 @@ int driver_obs_obsdaq::init() {
int
driver_obs_obsdaq
::
init_run
(
double
freq
){
// The receive buffer
std
::
string
recv
=
""
;
std
::
string
recv
;
// A command to send
char
cmd
[
20
];
// Index of the selected frequency
...
...
@@ -1246,7 +1246,7 @@ int driver_obs_obsdaq::check_baud(int baud){
if
(
checked_send
(
"$M"
,
"<ObsDaq"
,
7
,
0.2
,
0
)
!=
0
)
{
// No response, but freerun mode might be running, so check for data
int
n
=
0
;
for
(
int
i
=
0
;
i
<
2
;
i
++
)
{
for
(
int
i
=
0
;
i
<
5
;
i
++
)
{
if
(
waitanswer
(
0.4
)
==
0
)
n
++
;
}
fprintf
(
stderr
,
"N: %d
\n
"
,
n
);
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment