Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RIOT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cm-projects
RIOT
Commits
a7d9547d
Commit
a7d9547d
authored
7 years ago
by
Sebastian Meiling
Browse files
Options
Downloads
Patches
Plain Diff
driver, lsm6dsl: fix temperature reading
parent
ed227c7d
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
drivers/include/lsm6dsl.h
+5
-1
5 additions, 1 deletion
drivers/include/lsm6dsl.h
drivers/lsm6dsl/include/lsm6dsl_internal.h
+5
-0
5 additions, 0 deletions
drivers/lsm6dsl/include/lsm6dsl_internal.h
drivers/lsm6dsl/lsm6dsl.c
+14
-11
14 additions, 11 deletions
drivers/lsm6dsl/lsm6dsl.c
with
24 additions
and
12 deletions
drivers/include/lsm6dsl.h
+
5
−
1
View file @
a7d9547d
...
...
@@ -132,8 +132,12 @@ int lsm6dsl_read_gyro(const lsm6dsl_t *dev, lsm6dsl_3d_data_t *data);
/**
* @brief Read temperature data
*
* @note To avoid floating point data types but still provide high resolution
* for temperature readings, resulting values are scale by factor 100.
*
*
* @param[in] dev device to read
* @param[out] data temperature value
* @param[out] data temperature value
, in °C x 100
*
* @return 0 on success
* @return < 0 on error
...
...
This diff is collapsed.
Click to expand it.
drivers/lsm6dsl/include/lsm6dsl_internal.h
+
5
−
0
View file @
a7d9547d
...
...
@@ -149,6 +149,11 @@ extern "C" {
#define LSM6DSL_FIFO_CTRL3_GYRO_DEC_SHIFT (3)
/** @} */
/**
* @brief Offset for temperature calculation
*/
#define LSM6DSL_TEMP_OFFSET (0x1900)
#ifdef __cplusplus
}
#endif
...
...
This diff is collapsed.
Click to expand it.
drivers/lsm6dsl/lsm6dsl.c
+
14
−
11
View file @
a7d9547d
...
...
@@ -198,21 +198,24 @@ int lsm6dsl_read_gyro(const lsm6dsl_t *dev, lsm6dsl_3d_data_t *data)
int
lsm6dsl_read_temp
(
const
lsm6dsl_t
*
dev
,
int16_t
*
data
)
{
int
res
;
uint8_t
tmp
;
uint16_t
traw
;
/* read raw temperature */
i2c_acquire
(
dev
->
params
.
i2c
);
res
=
i2c_read_reg
(
dev
->
params
.
i2c
,
dev
->
params
.
addr
,
LSM6DSL_REG_OUT_TEMP_L
,
&
tmp
);
*
data
=
tmp
;
res
+=
i2c_read_reg
(
dev
->
params
.
i2c
,
dev
->
params
.
addr
,
LSM6DSL_REG_OUT_TEMP_H
,
&
tmp
);
*
data
|=
tmp
<<
8
;
i2c_release
(
dev
->
params
.
i2c
);
if
(
res
<
2
)
{
if
(
i2c_read_reg
(
dev
->
params
.
i2c
,
dev
->
params
.
addr
,
LSM6DSL_REG_OUT_TEMP_L
,
&
tmp
)
!=
1
)
{
i2c_release
(
dev
->
params
.
i2c
);
return
-
1
;
}
traw
=
tmp
;
if
(
i2c_read_reg
(
dev
->
params
.
i2c
,
dev
->
params
.
addr
,
LSM6DSL_REG_OUT_TEMP_H
,
&
tmp
)
!=
1
)
{
i2c_release
(
dev
->
params
.
i2c
);
return
-
1
;
}
traw
|=
(
uint16_t
)
tmp
<<
8
;
i2c_release
(
dev
->
params
.
i2c
);
/* convert temperature */
traw
+=
LSM6DSL_TEMP_OFFSET
;
*
data
=
(
int16_t
)(((
int32_t
)
traw
*
100
)
/
256
);
return
0
;
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment