Update ChangeLog; Convert a few tabs to spaces
This commit is contained in:
parent
194b0ace4d
commit
a543dfbcec
2 changed files with 7 additions and 5 deletions
|
|
@ -10809,4 +10809,6 @@
|
||||||
support Added MB7040 sonar. From Paul Alexander Patience (2015-08-11).
|
support Added MB7040 sonar. From Paul Alexander Patience (2015-08-11).
|
||||||
* net/udp: Add support for send() for connected UDP sockets
|
* net/udp: Add support for send() for connected UDP sockets
|
||||||
(2015-08-11).
|
(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).
|
||||||
|
|
|
||||||
|
|
@ -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)
|
static int ms5805_setosr(FAR struct ms5805_dev_s *priv, uint16_t osr)
|
||||||
{
|
{
|
||||||
int ret = OK;
|
int ret = OK;
|
||||||
|
|
||||||
sndbg("osr: %04x\n", osr);
|
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)
|
static int ms5805_reset(FAR struct ms5805_dev_s *priv)
|
||||||
{
|
{
|
||||||
uint8_t regaddr;
|
uint8_t regaddr;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
regaddr = MS5805_RESET_REG;
|
regaddr = MS5805_RESET_REG;
|
||||||
sndbg("addr: %02x\n", regaddr);
|
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,
|
static int ms5805_convert(FAR struct ms5805_dev_s *priv, uint8_t regaddr,
|
||||||
FAR uint32_t *regval)
|
FAR uint32_t *regval)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
regaddr |= priv->osr;
|
regaddr |= priv->osr;
|
||||||
sndbg("addr: %02x\n", regaddr);
|
sndbg("addr: %02x\n", regaddr);
|
||||||
|
|
@ -462,7 +462,7 @@ static int ms5805_measure(FAR struct ms5805_dev_s *priv)
|
||||||
int64_t off;
|
int64_t off;
|
||||||
int64_t sens;
|
int64_t sens;
|
||||||
int32_t press;
|
int32_t press;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = ms5805_convert(priv, MS5805_PRESS_REG, &rawpress);
|
ret = ms5805_convert(priv, MS5805_PRESS_REG, &rawpress);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue