Skip to content
GitLab
Menu
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
5244e183
Commit
5244e183
authored
Nov 06, 2018
by
Achim Morschhauser
Browse files
Change position of baudrate
parent
43598c63
Changes
3
Hide whitespace changes
Inline
Side-by-side
include/driver_obs_obsdaq.hpp
View file @
5244e183
...
...
@@ -67,8 +67,8 @@ public: driver_obs_obsdaq(std::string port, buffer_obs* buffer,
Obs_Calibration_Vector
*
cal
,
int
addr
=
0x0F
);
/** Standard constructor (Pre-defined baud rate) */
public:
driver_obs_obsdaq
(
std
::
string
port
,
buffer_obs
*
buffer
,
Obs_Calibration_Vector
*
cal
,
int
baud
,
int
addr
=
0x0F
);
public:
driver_obs_obsdaq
(
std
::
string
port
,
int
baud
,
buffer_obs
*
buffer
,
Obs_Calibration_Vector
*
cal
,
int
addr
=
0x0F
);
//
// Public Methods
...
...
src/driver_obs_obsdaq.cpp
View file @
5244e183
...
...
@@ -83,8 +83,8 @@ driver_obs_obsdaq::driver_obs_obsdaq(std::string port, buffer_obs* buffer,
* Default address is broadcast address: 0x0F. *
* *
****************************************************************************/
driver_obs_obsdaq
::
driver_obs_obsdaq
(
std
::
string
port
,
buffer_obs
*
buffer
,
Obs_Calibration_Vector
*
cal
,
int
baud
,
int
addr
)
:
driver_obs_obsdaq
::
driver_obs_obsdaq
(
std
::
string
port
,
int
baud
,
buffer_obs
*
buffer
,
Obs_Calibration_Vector
*
cal
,
int
addr
)
:
Driver_Obs_Serial
(
port
,
buffer
,
(
Obs_Calibration
*
)
cal
)
{
// Set the termination characters for serial port driver
...
...
usr/OBSDAQ_Logger.cpp
View file @
5244e183
...
...
@@ -33,8 +33,8 @@ int main() {
Obs_Calibration_Vector
cal
=
Obs_Calibration_Vector
(
X_s
/
R
,
Y_s
/
R
,
Z_s
/
R
);
// Initialize new OBSDAQ device
driver_obs_obsdaq
obsdaq
=
driver_obs_obsdaq
(
par
.
get_str
(
"PORT"
),
&
pipe
,
&
cal
,
par
.
get_int
(
"BAUD"
),
1
);
driver_obs_obsdaq
obsdaq
=
driver_obs_obsdaq
(
par
.
get_str
(
"PORT"
),
par
.
get_int
(
"BAUD"
),
&
pipe
,
&
cal
,
1
);
// Get some data
...
...
Write
Preview
Supports
Markdown
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