Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 15:58:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix: Sensor: Fix the use of ioexpander and delete redundant member of opt3006.

Browse Source 
N/A

Add pull up when using SETDIRECTION; Using transformation replace pinset;
Delete i2c point in opt3006 device struct.

Signed-off-by: yangjiukui <yangjiukui@xiaomi.com>
Change-Id: I7e46d0cde878fbca325f89be47c57ff9b9456ff0
This commit is contained in:
yangjiukui
2021-07-09 18:51:56 +08:00
parent fc3920904e
commit eafc254e14
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/sensors/opt3006.c
+4 -6
View File
@@ -108,7 +108,6 @@ struct opt3006_dev_s
bool activated; /* Sensor working state */ bool activated; /* Sensor working state */
uint64_t timestamp; /* Units is microseconds */ uint64_t timestamp; /* Units is microseconds */
unsigned int interval; /* Sensor acquisition interval */ unsigned int interval; /* Sensor acquisition interval */
FAR struct i2c_master_s *i2c; /* I2C interface */
FAR struct opt3006_config_s *config; /* The board config function */ FAR struct opt3006_config_s *config; /* The board config function */
FAR opt3006_registers_t *devreg; /* opt3006 device register */ FAR opt3006_registers_t *devreg; /* opt3006 device register */
struct work_s work; /* Interrupt handler worker */ struct work_s work; /* Interrupt handler worker */
@@ -305,7 +304,7 @@ static int opt3006_i2c_read(FAR struct opt3006_dev_s *priv, uint8_t regaddr,
/* Write 8 bits to device, then read 16-bits from the device */ /* Write 8 bits to device, then read 16-bits from the device */
ret = i2c_writeread(priv->i2c, &config, &regaddr, 1, buffer, 2); ret = i2c_writeread(priv->config->i2c, &config, &regaddr, 1, buffer, 2);
if (ret < 0) if (ret < 0)
{ {
snerr("I2C writeread failed: %d\n", ret); snerr("I2C writeread failed: %d\n", ret);
@@ -362,7 +361,7 @@ static int opt3006_i2c_write(FAR struct opt3006_dev_s *priv,
/* Write the Modbus write request. */ /* Write the Modbus write request. */
ret = i2c_write(priv->i2c, &config, buf, sizeof(buf)); ret = i2c_write(priv->config->i2c, &config, buf, sizeof(buf));
if (ret < 0) if (ret < 0)
{ {
snerr("I2C write failed: %d\n", ret); snerr("I2C write failed: %d\n", ret);
@@ -1071,7 +1070,6 @@ int opt3006_register(int devno, FAR const struct opt3006_config_s *config)
return -ENOMEM; return -ENOMEM;
} }
priv->i2c = config->i2c;
priv->config = config; priv->config = config;
priv->devreg = &g_opt3006_devreg; priv->devreg = &g_opt3006_devreg;
priv->lower.ops = &g_opt3006_ops; priv->lower.ops = &g_opt3006_ops;
@@ -1107,14 +1105,14 @@ int opt3006_register(int devno, FAR const struct opt3006_config_s *config)
/* Interrupt register */ /* Interrupt register */
ret = IOEXP_SETDIRECTION(priv->config->ioedev, priv->config->pin, ret = IOEXP_SETDIRECTION(priv->config->ioedev, priv->config->pin,
IOEXPANDER_DIRECTION_IN); IOEXPANDER_DIRECTION_IN_PULLUP);
if (ret < 0) if (ret < 0)
{ {
snerr("Failed to set direction: %d\n", ret); snerr("Failed to set direction: %d\n", ret);
goto err; goto err;
} }
ioephanle = IOEP_ATTACH(priv->config->ioedev, priv->config->pinset, ioephanle = IOEP_ATTACH(priv->config->ioedev, (1 << priv->config->pin),
opt3006_interrupt_handler, priv); opt3006_interrupt_handler, priv);
if (ioephanle == NULL) if (ioephanle == NULL)
{ {
include/nuttx/sensors/opt3006.h
-1
View File
@@ -46,7 +46,6 @@ struct opt3006_config_s
int pin; /* Interrupt pin */ int pin; /* Interrupt pin */
FAR struct i2c_master_s *i2c; /* I2C interface */ FAR struct i2c_master_s *i2c; /* I2C interface */
FAR struct ioexpander_dev_s *ioedev; /* Ioexpander device */ FAR struct ioexpander_dev_s *ioedev; /* Ioexpander device */
uint32_t pinset; /* Interrupt pin set */
}; };
/**************************************************************************** /****************************************************************************