Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
NuttX RTOS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
f4grx
NuttX RTOS
Commits
a543dfbc
Commit
a543dfbc
authored
9 years ago
by
Gregory Nutt
Browse files
Options
Downloads
Patches
Plain Diff
Update ChangeLog; Convert a few tabs to spaces
parent
194b0ace
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+3
-1
3 additions, 1 deletion
ChangeLog
drivers/sensors/ms5805.c
+4
-4
4 additions, 4 deletions
drivers/sensors/ms5805.c
with
7 additions
and
5 deletions
ChangeLog
+
3
−
1
View file @
a543dfbc
...
...
@@ -10809,4 +10809,6 @@
support Added MB7040 sonar. From Paul Alexander Patience (2015-08-11).
* net/udp: Add support for send() for connected UDP sockets
(2015-08-11).
* drivers/sensors/ms5805.c and include/nuttx/sensors/ms5805.h: Add
support for an MS5805 altimeter. From Paul Alexander Patience
(2015-08-07).
This diff is collapsed.
Click to expand it.
drivers/sensors/ms5805.c
+
4
−
4
View file @
a543dfbc
...
...
@@ -274,7 +274,7 @@ static int ms5805_readadc(FAR struct ms5805_dev_s *priv, FAR uint32_t *adc)
static
int
ms5805_setosr
(
FAR
struct
ms5805_dev_s
*
priv
,
uint16_t
osr
)
{
int
ret
=
OK
;
int
ret
=
OK
;
sndbg
(
"osr: %04x
\n
"
,
osr
);
...
...
@@ -378,7 +378,7 @@ static int ms5805_readprom(FAR struct ms5805_dev_s *priv)
static
int
ms5805_reset
(
FAR
struct
ms5805_dev_s
*
priv
)
{
uint8_t
regaddr
;
int
ret
;
int
ret
;
regaddr
=
MS5805_RESET_REG
;
sndbg
(
"addr: %02x
\n
"
,
regaddr
);
...
...
@@ -415,7 +415,7 @@ static int ms5805_reset(FAR struct ms5805_dev_s *priv)
static
int
ms5805_convert
(
FAR
struct
ms5805_dev_s
*
priv
,
uint8_t
regaddr
,
FAR
uint32_t
*
regval
)
{
int
ret
;
int
ret
;
regaddr
|=
priv
->
osr
;
sndbg
(
"addr: %02x
\n
"
,
regaddr
);
...
...
@@ -462,7 +462,7 @@ static int ms5805_measure(FAR struct ms5805_dev_s *priv)
int64_t
off
;
int64_t
sens
;
int32_t
press
;
int
ret
;
int
ret
;
ret
=
ms5805_convert
(
priv
,
MS5805_PRESS_REG
,
&
rawpress
);
if
(
ret
<
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