warning cleanup, and ability to set cpi via the device tree
This commit is contained in:
parent
f398f02e57
commit
ab7673f268
3 changed files with 356 additions and 377 deletions
|
@ -1,5 +1,3 @@
|
||||||
|
|
||||||
|
|
||||||
#define DT_DRV_COMPAT pixart_pmw33xx
|
#define DT_DRV_COMPAT pixart_pmw33xx
|
||||||
|
|
||||||
#include <drivers/spi.h>
|
#include <drivers/spi.h>
|
||||||
|
@ -22,6 +20,10 @@
|
||||||
|
|
||||||
LOG_MODULE_REGISTER(PMW33XX, CONFIG_SENSOR_LOG_LEVEL);
|
LOG_MODULE_REGISTER(PMW33XX, CONFIG_SENSOR_LOG_LEVEL);
|
||||||
#define PMW33XX_PID COND_CODE_1(CONFIG_PMW33XX_3389, (PMW33XX_3389_PID), (PMW33XX_3360_PID))
|
#define PMW33XX_PID COND_CODE_1(CONFIG_PMW33XX_3389, (PMW33XX_3389_PID), (PMW33XX_3360_PID))
|
||||||
|
#define PMW33XX_CPI_MAX \
|
||||||
|
COND_CODE_1(CONFIG_PMW33XX_3389, (PMW33XX_3389_CPI_MAX), (PMW33XX_3360_CPI_MAX))
|
||||||
|
#define PMW33XX_CPI_MIN \
|
||||||
|
COND_CODE_1(CONFIG_PMW33XX_3389, (PMW33XX_3389_CPI_MIN), (PMW33XX_3360_CPI_MIN))
|
||||||
|
|
||||||
struct pmw33xx_motion_burst {
|
struct pmw33xx_motion_burst {
|
||||||
uint8_t motion;
|
uint8_t motion;
|
||||||
|
@ -31,13 +33,11 @@ struct pmw33xx_motion_burst {
|
||||||
} __attribute__((packed));
|
} __attribute__((packed));
|
||||||
|
|
||||||
static inline int pmw33xx_cs_select(const struct pmw33xx_gpio_dt_spec *cs_gpio_cfg,
|
static inline int pmw33xx_cs_select(const struct pmw33xx_gpio_dt_spec *cs_gpio_cfg,
|
||||||
const uint8_t value)
|
const uint8_t value) {
|
||||||
{
|
|
||||||
return gpio_pin_set(cs_gpio_cfg->port, cs_gpio_cfg->pin, value);
|
return gpio_pin_set(cs_gpio_cfg->port, cs_gpio_cfg->pin, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int pmw33xx_access(const struct device *dev, const uint8_t reg, uint8_t *value)
|
static int pmw33xx_access(const struct device *dev, const uint8_t reg, uint8_t *value) {
|
||||||
{
|
|
||||||
struct pmw33xx_data *data = dev->data;
|
struct pmw33xx_data *data = dev->data;
|
||||||
const struct pmw33xx_config *cfg = dev->config;
|
const struct pmw33xx_config *cfg = dev->config;
|
||||||
const struct spi_config *spi_cfg = &cfg->bus_cfg.spi_cfg->spi_conf;
|
const struct spi_config *spi_cfg = &cfg->bus_cfg.spi_cfg->spi_conf;
|
||||||
|
@ -45,18 +45,20 @@ static int pmw33xx_access(const struct device *dev, const uint8_t reg, uint8_t *
|
||||||
|
|
||||||
uint8_t access[1] = {reg};
|
uint8_t access[1] = {reg};
|
||||||
struct spi_buf_set tx = {
|
struct spi_buf_set tx = {
|
||||||
.buffers = { &(struct spi_buf){
|
.buffers =
|
||||||
|
&(struct spi_buf){
|
||||||
.buf = access,
|
.buf = access,
|
||||||
.len = 1,
|
.len = 1,
|
||||||
} },
|
},
|
||||||
.count = 1,
|
.count = 1,
|
||||||
};
|
};
|
||||||
uint8_t result[1] = {*value};
|
uint8_t result[1] = {*value};
|
||||||
struct spi_buf_set rx = {
|
struct spi_buf_set rx = {
|
||||||
.buffers = { &(struct spi_buf){
|
.buffers =
|
||||||
|
&(struct spi_buf){
|
||||||
.buf = result,
|
.buf = result,
|
||||||
.len = 1,
|
.len = 1,
|
||||||
} },
|
},
|
||||||
.count = 1,
|
.count = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -79,27 +81,25 @@ static int pmw33xx_access(const struct device *dev, const uint8_t reg, uint8_t *
|
||||||
*value = result[0];
|
*value = result[0];
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
static int pmw33xx_read_reg(const struct device *dev, const uint8_t reg, uint8_t *value)
|
static int pmw33xx_read_reg(const struct device *dev, const uint8_t reg, uint8_t *value) {
|
||||||
{
|
|
||||||
return pmw33xx_access(dev, reg & PMW33XX_RD_MASK, value);
|
return pmw33xx_access(dev, reg & PMW33XX_RD_MASK, value);
|
||||||
}
|
}
|
||||||
static int pmw33xx_write_reg(const struct device *dev, const uint8_t reg, const uint8_t value)
|
static int pmw33xx_write_reg(const struct device *dev, const uint8_t reg, const uint8_t value) {
|
||||||
{
|
|
||||||
uint8_t v = value;
|
uint8_t v = value;
|
||||||
return pmw33xx_access(dev, reg | PMW33XX_WR_MASK, &v);
|
return pmw33xx_access(dev, reg | PMW33XX_WR_MASK, &v);
|
||||||
}
|
}
|
||||||
static int pmw33xx_write_srom(const struct device *dev)
|
static int pmw33xx_write_srom(const struct device *dev) {
|
||||||
{
|
|
||||||
struct pmw33xx_data *data = dev->data;
|
struct pmw33xx_data *data = dev->data;
|
||||||
const struct pmw33xx_config *cfg = dev->config;
|
const struct pmw33xx_config *cfg = dev->config;
|
||||||
const struct spi_config *spi_cfg = &cfg->bus_cfg.spi_cfg->spi_conf;
|
const struct spi_config *spi_cfg = &cfg->bus_cfg.spi_cfg->spi_conf;
|
||||||
const struct pmw33xx_gpio_dt_spec *cs_gpio_cfg = &cfg->bus_cfg.spi_cfg->cs_spec;
|
const struct pmw33xx_gpio_dt_spec *cs_gpio_cfg = &cfg->bus_cfg.spi_cfg->cs_spec;
|
||||||
uint8_t access[1] = {PMW33XX_REG_SROM_BURST | PMW33XX_WR_MASK};
|
uint8_t access[1] = {PMW33XX_REG_SROM_BURST | PMW33XX_WR_MASK};
|
||||||
struct spi_buf_set tx = {
|
struct spi_buf_set tx = {
|
||||||
.buffers = { &(struct spi_buf){
|
.buffers =
|
||||||
|
&(struct spi_buf){
|
||||||
.buf = access,
|
.buf = access,
|
||||||
.len = 1,
|
.len = 1,
|
||||||
} },
|
},
|
||||||
.count = 1,
|
.count = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -132,8 +132,7 @@ static int pmw33xx_write_srom(const struct device *dev)
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int pmw33xx_read_motion_burst(const struct device *dev, struct pmw33xx_motion_burst *burst)
|
static int pmw33xx_read_motion_burst(const struct device *dev, struct pmw33xx_motion_burst *burst) {
|
||||||
{
|
|
||||||
struct pmw33xx_data *data = dev->data;
|
struct pmw33xx_data *data = dev->data;
|
||||||
const struct pmw33xx_config *cfg = dev->config;
|
const struct pmw33xx_config *cfg = dev->config;
|
||||||
const struct spi_config *spi_cfg = &cfg->bus_cfg.spi_cfg->spi_conf;
|
const struct spi_config *spi_cfg = &cfg->bus_cfg.spi_cfg->spi_conf;
|
||||||
|
@ -141,17 +140,19 @@ static int pmw33xx_read_motion_burst(const struct device *dev, struct pmw33xx_mo
|
||||||
|
|
||||||
uint8_t access[1] = {PMW33XX_REG_BURST};
|
uint8_t access[1] = {PMW33XX_REG_BURST};
|
||||||
struct spi_buf_set tx = {
|
struct spi_buf_set tx = {
|
||||||
.buffers = { &(struct spi_buf){
|
.buffers =
|
||||||
|
&(struct spi_buf){
|
||||||
.buf = access,
|
.buf = access,
|
||||||
.len = 1,
|
.len = 1,
|
||||||
} },
|
},
|
||||||
.count = 1,
|
.count = 1,
|
||||||
};
|
};
|
||||||
struct spi_buf_set rx = {
|
struct spi_buf_set rx = {
|
||||||
.buffers = { &(struct spi_buf){
|
.buffers =
|
||||||
|
&(struct spi_buf){
|
||||||
.buf = (uint8_t *)burst,
|
.buf = (uint8_t *)burst,
|
||||||
.len = sizeof(struct pmw33xx_motion_burst),
|
.len = sizeof(struct pmw33xx_motion_burst),
|
||||||
} },
|
},
|
||||||
.count = 1,
|
.count = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -168,41 +169,8 @@ static int pmw33xx_read_motion_burst(const struct device *dev, struct pmw33xx_mo
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
// converts twos complement data to an int16
|
int pmw33xx_spi_init(const struct device *dev) {
|
||||||
static int16_t pmw33xx_raw_to_int16(const uint8_t src[2])
|
|
||||||
{
|
|
||||||
int16_t res = sys_get_be16(src);
|
|
||||||
if (res > BIT_MASK(15))
|
|
||||||
res -= BIT(16);
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int pmw33xx_read_raw(const struct device *dev, const uint8_t reg_high, const uint8_t reg_low,
|
|
||||||
int16_t *value)
|
|
||||||
{
|
|
||||||
uint8_t raw[2] = { 0x0, 0x0 };
|
|
||||||
int err;
|
|
||||||
err = pmw33xx_read_reg(dev, reg_high, &raw[0]);
|
|
||||||
if (err) {
|
|
||||||
LOG_ERR("could not read high byte at %x", reg_high);
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
k_sleep(K_USEC(100));
|
|
||||||
err = pmw33xx_read_reg(dev, reg_low, &raw[1]);
|
|
||||||
if (err) {
|
|
||||||
LOG_ERR("could not read low byte at %x", reg_low);
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
k_sleep(K_USEC(100));
|
|
||||||
*value = pmw33xx_raw_to_int16(raw);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int pmw33xx_spi_init(const struct device *dev)
|
|
||||||
{
|
|
||||||
struct pmw33xx_data *data = dev->data;
|
|
||||||
const struct pmw33xx_config *cfg = dev->config;
|
const struct pmw33xx_config *cfg = dev->config;
|
||||||
const struct pmw33xx_spi_cfg *spi_cfg = cfg->bus_cfg.spi_cfg;
|
|
||||||
const struct pmw33xx_gpio_dt_spec *cs_gpio_cfg = &cfg->bus_cfg.spi_cfg->cs_spec;
|
const struct pmw33xx_gpio_dt_spec *cs_gpio_cfg = &cfg->bus_cfg.spi_cfg->cs_spec;
|
||||||
|
|
||||||
int err;
|
int err;
|
||||||
|
@ -214,10 +182,8 @@ int pmw33xx_spi_init(const struct device *dev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int pmw33xx_sample_fetch(const struct device *dev, enum sensor_channel chan)
|
static int pmw33xx_sample_fetch(const struct device *dev, enum sensor_channel chan) {
|
||||||
{
|
|
||||||
struct pmw33xx_data *data = dev->data;
|
struct pmw33xx_data *data = dev->data;
|
||||||
const struct pmw33xx_config *cfg = dev->config;
|
|
||||||
struct pmw33xx_motion_burst burst;
|
struct pmw33xx_motion_burst burst;
|
||||||
|
|
||||||
if (chan != SENSOR_CHAN_ALL && chan != SENSOR_CHAN_POS_DX && chan != SENSOR_CHAN_POS_DY)
|
if (chan != SENSOR_CHAN_ALL && chan != SENSOR_CHAN_POS_DX && chan != SENSOR_CHAN_POS_DY)
|
||||||
|
@ -228,17 +194,15 @@ static int pmw33xx_sample_fetch(const struct device *dev, enum sensor_channel ch
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
if (chan == SENSOR_CHAN_ALL || chan == SENSOR_CHAN_POS_DX)
|
if (chan == SENSOR_CHAN_ALL || chan == SENSOR_CHAN_POS_DX)
|
||||||
data->dx = burst.dx;
|
data->dx += burst.dx;
|
||||||
if (chan == SENSOR_CHAN_ALL || chan == SENSOR_CHAN_POS_DY)
|
if (chan == SENSOR_CHAN_ALL || chan == SENSOR_CHAN_POS_DY)
|
||||||
data->dy = burst.dy;
|
data->dy += burst.dy;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int pmw33xx_channel_get(const struct device *dev, enum sensor_channel chan,
|
static int pmw33xx_channel_get(const struct device *dev, enum sensor_channel chan,
|
||||||
struct sensor_value *val)
|
struct sensor_value *val) {
|
||||||
{
|
|
||||||
struct pmw33xx_data *data = dev->data;
|
struct pmw33xx_data *data = dev->data;
|
||||||
const struct pmw33xx_config *cfg = dev->config;
|
|
||||||
|
|
||||||
switch (chan) {
|
switch (chan) {
|
||||||
case SENSOR_CHAN_POS_DX:
|
case SENSOR_CHAN_POS_DX:
|
||||||
|
@ -260,44 +224,33 @@ static const struct sensor_driver_api pmw33xx_driver_api = {
|
||||||
#ifdef CONFIG_PMW33XX_TRIGGER
|
#ifdef CONFIG_PMW33XX_TRIGGER
|
||||||
.trigger_set = pmw33xx_trigger_set,
|
.trigger_set = pmw33xx_trigger_set,
|
||||||
#endif
|
#endif
|
||||||
|
// eventually implement this to allow setting cpi from the driver api maybe
|
||||||
// .attr_set = pmw33xx_attr_set,
|
// .attr_set = pmw33xx_attr_set,
|
||||||
.sample_fetch = pmw33xx_sample_fetch,
|
.sample_fetch = pmw33xx_sample_fetch,
|
||||||
.channel_get = pmw33xx_channel_get,
|
.channel_get = pmw33xx_channel_get,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int pmw33xx_init_chip(const struct device *dev)
|
static int pmw33xx_set_cpi(const struct device *dev, uint16_t cpi) {
|
||||||
{
|
#ifdef CONFIG_PMW33XX_3360
|
||||||
struct pmw33xx_data *data = dev->data;
|
if (cpi > PMW33XX_CPI_MIN && cpi < PMW33XX_CPI_MAX)
|
||||||
return 0;
|
return pmw33xx_write_reg(dev, PMW33XX_3360_REG_CPI,
|
||||||
|
((cpi / 100) - 1)); /* 100-12000, 100 cpi LSb */
|
||||||
|
#elif CONFIG_PMW33XX_3389
|
||||||
|
if (cpi > PMW33XX_CPI_MIN && cpi < PMW33XX_CPI_MAX) {
|
||||||
|
cpi /= 50;
|
||||||
|
int err =
|
||||||
|
pmw33xx_write_reg(dev, PMW33XX_3389_REG_CPI_L, cpi & 0xFF); /* 50-16000, 50 cpi LSb */
|
||||||
|
if (err) {
|
||||||
|
return err;
|
||||||
}
|
}
|
||||||
|
return pmw33xx_write_reg(dev, PMW33XX_3389_REG_CPI_H, cpi >> 8); /* 50-16000, 50 cpi LSb */
|
||||||
static int pmw33xx_init(const struct device *dev)
|
|
||||||
{
|
|
||||||
const struct pmw33xx_config *const config = dev->config;
|
|
||||||
struct pmw33xx_data *data = dev->data;
|
|
||||||
|
|
||||||
data->bus = device_get_binding(config->bus_name);
|
|
||||||
if (!data->bus) {
|
|
||||||
LOG_DBG("master not found: %s", log_strdup(config->bus_name));
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
config->bus_init(dev);
|
|
||||||
|
|
||||||
if (pmw33xx_init_chip(dev) < 0) {
|
|
||||||
LOG_DBG("failed to initialize chip");
|
|
||||||
return -EIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
const struct pmw33xx_gpio_dt_spec *cs_gpio_cfg = &config->bus_cfg.spi_cfg->cs_spec;
|
|
||||||
|
|
||||||
#ifdef CONFIG_PMW33XX_TRIGGER
|
|
||||||
if (pmw33xx_init_interrupt(dev) < 0) {
|
|
||||||
LOG_DBG("Failed to initialize interrupt!");
|
|
||||||
return -EIO;
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
return -ENOTSUP;
|
||||||
|
}
|
||||||
|
static int pmw33xx_init_chip(const struct device *dev) {
|
||||||
|
const struct pmw33xx_config *const config = dev->config;
|
||||||
|
const struct pmw33xx_gpio_dt_spec *cs_gpio_cfg = &config->bus_cfg.spi_cfg->cs_spec;
|
||||||
pmw33xx_cs_select(cs_gpio_cfg, 1);
|
pmw33xx_cs_select(cs_gpio_cfg, 1);
|
||||||
k_sleep(K_MSEC(1));
|
k_sleep(K_MSEC(1));
|
||||||
|
|
||||||
|
@ -350,13 +303,40 @@ static int pmw33xx_init(const struct device *dev)
|
||||||
struct pmw33xx_motion_burst val;
|
struct pmw33xx_motion_burst val;
|
||||||
pmw33xx_read_motion_burst(dev, &val); // read and throwout initial motion data
|
pmw33xx_read_motion_burst(dev, &val); // read and throwout initial motion data
|
||||||
|
|
||||||
|
if (config->cpi > PMW33XX_CPI_MIN && config->cpi < PMW33XX_CPI_MAX)
|
||||||
|
return pmw33xx_set_cpi(dev, config->cpi);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int pmw33xx_init(const struct device *dev) {
|
||||||
|
const struct pmw33xx_config *const config = dev->config;
|
||||||
|
struct pmw33xx_data *data = dev->data;
|
||||||
|
|
||||||
|
data->bus = device_get_binding(config->bus_name);
|
||||||
|
if (!data->bus) {
|
||||||
|
LOG_DBG("master not found: %s", log_strdup(config->bus_name));
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
config->bus_init(dev);
|
||||||
|
|
||||||
|
if (pmw33xx_init_chip(dev) < 0) {
|
||||||
|
LOG_DBG("failed to initialize chip");
|
||||||
|
return -EIO;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_PMW33XX_TRIGGER
|
||||||
|
if (pmw33xx_init_interrupt(dev) < 0) {
|
||||||
|
LOG_DBG("Failed to initialize interrupt!");
|
||||||
|
return -EIO;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define PMW33XX_DATA_SPI(n) \
|
#define PMW33XX_DATA_SPI(n) \
|
||||||
{ \
|
{ .cs_ctrl = {}, }
|
||||||
.cs_ctrl = {}, \
|
|
||||||
}
|
|
||||||
|
|
||||||
#define PMW33XX_SPI_CFG(n) \
|
#define PMW33XX_SPI_CFG(n) \
|
||||||
(&(struct pmw33xx_spi_cfg){ \
|
(&(struct pmw33xx_spi_cfg){ \
|
||||||
|
@ -381,9 +361,9 @@ static int pmw33xx_init(const struct device *dev)
|
||||||
{ \
|
{ \
|
||||||
.bus_name = DT_INST_BUS_LABEL(n), .bus_init = pmw33xx_spi_init, \
|
.bus_name = DT_INST_BUS_LABEL(n), .bus_init = pmw33xx_spi_init, \
|
||||||
.bus_cfg = {.spi_cfg = PMW33XX_SPI_CFG(n)}, \
|
.bus_cfg = {.spi_cfg = PMW33XX_SPI_CFG(n)}, \
|
||||||
COND_CODE_1(CONFIG_MA730_TRIGGER, \
|
COND_CODE_0(DT_INST_NODE_HAS_PROP(n, cpi), (0), (DT_INST_PROP(n, cpi))) \
|
||||||
(, PMW33XX_GPIO_DT_SPEC_GET_BY_IDX(DT_DRV_INST(n), motswk_gpios, 0)), \
|
COND_CODE_1(CONFIG_PMW33XX_TRIGGER, \
|
||||||
()) \
|
(PMW33XX_GPIO_DT_SPEC_GET_BY_IDX(DT_DRV_INST(n), motswk_gpios, 0)), ()) \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define PMW33XX_INST(n) \
|
#define PMW33XX_INST(n) \
|
||||||
|
|
|
@ -65,6 +65,11 @@
|
||||||
/* power up reset cmd */
|
/* power up reset cmd */
|
||||||
#define PMW33XX_RESET_CMD 0x5A
|
#define PMW33XX_RESET_CMD 0x5A
|
||||||
|
|
||||||
|
#define PMW33XX_3389_CPI_MIN 50
|
||||||
|
#define PMW33XX_3389_CPI_MAX 16000
|
||||||
|
#define PMW33XX_3360_CPI_MIN 100
|
||||||
|
#define PMW33XX_3360_CPI_MAX 12000
|
||||||
|
|
||||||
struct pmw33xx_gpio_dt_spec {
|
struct pmw33xx_gpio_dt_spec {
|
||||||
const struct device *port;
|
const struct device *port;
|
||||||
gpio_pin_t pin;
|
gpio_pin_t pin;
|
||||||
|
@ -84,7 +89,7 @@ struct pmw33xx_config {
|
||||||
char *bus_name;
|
char *bus_name;
|
||||||
int (*bus_init)(const struct device *dev);
|
int (*bus_init)(const struct device *dev);
|
||||||
const union pmw33xx_bus_cfg bus_cfg;
|
const union pmw33xx_bus_cfg bus_cfg;
|
||||||
int resolution;
|
int cpi;
|
||||||
#if CONFIG_PMW33XX_TRIGGER
|
#if CONFIG_PMW33XX_TRIGGER
|
||||||
struct pmw33xx_gpio_dt_spec motswk_spec;
|
struct pmw33xx_gpio_dt_spec motswk_spec;
|
||||||
#endif // CONFIG_PMW33XX_TRIGGER
|
#endif // CONFIG_PMW33XX_TRIGGER
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
* SPDX-License-Identifier: MIT
|
* SPDX-License-Identifier: MIT
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define DT_DRV_COMPAT pixart_pmw3389
|
#define DT_DRV_COMPAT pixart_pmw33xx
|
||||||
|
|
||||||
#include <device.h>
|
#include <device.h>
|
||||||
#include <drivers/gpio.h>
|
#include <drivers/gpio.h>
|
||||||
|
@ -12,17 +12,16 @@
|
||||||
#include <kernel.h>
|
#include <kernel.h>
|
||||||
#include <drivers/sensor.h>
|
#include <drivers/sensor.h>
|
||||||
|
|
||||||
#include "pmw3389.h"
|
#include "pmw33xx.h"
|
||||||
|
|
||||||
// extern struct pmw3389_data pmw3389_driver;
|
// extern struct pmw33xx_data pmw33xx_driver;
|
||||||
|
|
||||||
#include <logging/log.h>
|
#include <logging/log.h>
|
||||||
LOG_MODULE_DECLARE(PMW3389, CONFIG_SENSOR_LOG_LEVEL);
|
LOG_MODULE_DECLARE(PMW33XX, CONFIG_SENSOR_LOG_LEVEL);
|
||||||
|
|
||||||
static inline void setup_int(const struct device *dev, bool enable)
|
static inline void setup_int(const struct device *dev, bool enable) {
|
||||||
{
|
struct pmw33xx_data *data = dev->data;
|
||||||
struct pmw3389_data *data = dev->data;
|
const struct pmw33xx_config *cfg = dev->config;
|
||||||
const struct pmw3389_config *cfg = dev->config;
|
|
||||||
|
|
||||||
if (gpio_pin_interrupt_configure(cfg->motswk_spec.port, cfg->motswk_spec.pin,
|
if (gpio_pin_interrupt_configure(cfg->motswk_spec.port, cfg->motswk_spec.pin,
|
||||||
enable ? GPIO_INT_EDGE_TO_ACTIVE : GPIO_INT_DISABLE)) {
|
enable ? GPIO_INT_EDGE_TO_ACTIVE : GPIO_INT_DISABLE)) {
|
||||||
|
@ -30,25 +29,23 @@ static inline void setup_int(const struct device *dev, bool enable)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pmw3389_motswk_gpio_callback(const struct device *dev, struct gpio_callback *cb,
|
static void pmw33xx_motswk_gpio_callback(const struct device *dev, struct gpio_callback *cb,
|
||||||
uint32_t pins)
|
uint32_t pins) {
|
||||||
{
|
struct pmw33xx_data *drv_data = CONTAINER_OF(cb, struct pmw33xx_data, motswk_gpio_cb);
|
||||||
struct pmw3389_data *drv_data = CONTAINER_OF(cb, struct pmw3389_data, motswk_gpio_cb);
|
|
||||||
|
|
||||||
LOG_DBG("");
|
LOG_DBG("");
|
||||||
|
|
||||||
setup_int(drv_data->dev, false);
|
setup_int(drv_data->dev, false);
|
||||||
|
|
||||||
#if defined(CONFIG_PMW3389_TRIGGER_OWN_THREAD)
|
#if defined(CONFIG_PMW33XX_TRIGGER_OWN_THREAD)
|
||||||
k_sem_give(&drv_data->gpio_sem);
|
k_sem_give(&drv_data->gpio_sem);
|
||||||
#elif defined(CONFIG_PMW3389_TRIGGER_GLOBAL_THREAD)
|
#elif defined(CONFIG_PMW33XX_TRIGGER_GLOBAL_THREAD)
|
||||||
k_work_submit(&drv_data->work);
|
k_work_submit(&drv_data->work);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pmw3389_thread_cb(const struct device *dev)
|
static void pmw33xx_thread_cb(const struct device *dev) {
|
||||||
{
|
struct pmw33xx_data *drv_data = dev->data;
|
||||||
struct pmw3389_data *drv_data = dev->data;
|
|
||||||
|
|
||||||
LOG_DBG("%p", drv_data->handler);
|
LOG_DBG("%p", drv_data->handler);
|
||||||
drv_data->handler(dev, drv_data->trigger);
|
drv_data->handler(dev, drv_data->trigger);
|
||||||
|
@ -57,36 +54,33 @@ static void pmw3389_thread_cb(const struct device *dev)
|
||||||
setup_int(dev, true);
|
setup_int(dev, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PMW3389_TRIGGER_OWN_THREAD
|
#ifdef CONFIG_PMW33XX_TRIGGER_OWN_THREAD
|
||||||
static void pmw3389_thread(int dev_ptr, int unused)
|
static void pmw33xx_thread(int dev_ptr, int unused) {
|
||||||
{
|
|
||||||
const struct device *dev = INT_TO_POINTER(dev_ptr);
|
const struct device *dev = INT_TO_POINTER(dev_ptr);
|
||||||
struct pmw3389_data *drv_data = dev->data;
|
struct pmw33xx_data *drv_data = dev->data;
|
||||||
|
|
||||||
ARG_UNUSED(unused);
|
ARG_UNUSED(unused);
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
k_sem_take(&drv_data->gpio_sem, K_FOREVER);
|
k_sem_take(&drv_data->gpio_sem, K_FOREVER);
|
||||||
pmw3389_thread_cb(dev);
|
pmw33xx_thread_cb(dev);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_PMW3389_TRIGGER_GLOBAL_THREAD
|
#ifdef CONFIG_PMW33XX_TRIGGER_GLOBAL_THREAD
|
||||||
static void pmw3389_work_cb(struct k_work *work)
|
static void pmw33xx_work_cb(struct k_work *work) {
|
||||||
{
|
struct pmw33xx_data *drv_data = CONTAINER_OF(work, struct pmw33xx_data, work);
|
||||||
struct pmw3389_data *drv_data = CONTAINER_OF(work, struct pmw3389_data, work);
|
|
||||||
|
|
||||||
LOG_DBG("");
|
LOG_DBG("");
|
||||||
|
|
||||||
pmw3389_thread_cb(drv_data->dev);
|
pmw33xx_thread_cb(drv_data->dev);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int pmw3389_trigger_set(const struct device *dev, const struct sensor_trigger *trig,
|
int pmw33xx_trigger_set(const struct device *dev, const struct sensor_trigger *trig,
|
||||||
sensor_trigger_handler_t handler)
|
sensor_trigger_handler_t handler) {
|
||||||
{
|
struct pmw33xx_data *drv_data = dev->data;
|
||||||
struct pmw3389_data *drv_data = dev->data;
|
|
||||||
|
|
||||||
setup_int(dev, false);
|
setup_int(dev, false);
|
||||||
|
|
||||||
|
@ -100,30 +94,30 @@ int pmw3389_trigger_set(const struct device *dev, const struct sensor_trigger *t
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int pmw3389_init_interrupt(const struct device *dev)
|
int pmw33xx_init_interrupt(const struct device *dev) {
|
||||||
{
|
struct pmw33xx_data *drv_data = dev->data;
|
||||||
struct pmw3389_data *drv_data = dev->data;
|
const struct pmw33xx_config *drv_cfg = dev->config;
|
||||||
const struct pmw3389_config *drv_cfg = dev->config;
|
|
||||||
|
|
||||||
drv_data->dev = dev;
|
drv_data->dev = dev;
|
||||||
/* setup gpio interrupt */
|
/* setup gpio interrupt */
|
||||||
|
|
||||||
gpio_init_callback(&drv_data->motswk_gpio_cb, pmw3389_motswk_gpio_callback,
|
gpio_init_callback(&drv_data->motswk_gpio_cb, pmw33xx_motswk_gpio_callback,
|
||||||
BIT(drv_cfg->motswk_spec.pin));
|
BIT(drv_cfg->motswk_spec.pin));
|
||||||
|
|
||||||
if (gpio_add_callback(drv_cfg->motswk_spec.port, &drv_data->motswk_gpio_cb) < 0) {
|
int err = gpio_add_callback(drv_cfg->motswk_spec.port, &drv_data->motswk_gpio_cb);
|
||||||
|
if (err < 0) {
|
||||||
LOG_DBG("Failed to set MOTSWK callback!");
|
LOG_DBG("Failed to set MOTSWK callback!");
|
||||||
return -EIO;
|
return -EIO;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_PMW3389_TRIGGER_OWN_THREAD)
|
#if defined(CONFIG_PMW33XX_TRIGGER_OWN_THREAD)
|
||||||
k_sem_init(&drv_data->gpio_sem, 0, UINT_MAX);
|
k_sem_init(&drv_data->gpio_sem, 0, UINT_MAX);
|
||||||
|
|
||||||
k_thread_create(&drv_data->thread, drv_data->thread_stack, CONFIG_PMW3389_THREAD_STACK_SIZE,
|
k_thread_create(&drv_data->thread, drv_data->thread_stack, CONFIG_PMW33XX_THREAD_STACK_SIZE,
|
||||||
(k_thread_entry_t)pmw3389_thread, dev, 0, NULL,
|
(k_thread_entry_t)pmw33xx_thread, dev, 0, NULL,
|
||||||
K_PRIO_COOP(CONFIG_PMW3389_THREAD_PRIORITY), 0, K_NO_WAIT);
|
K_PRIO_COOP(CONFIG_PMW33XX_THREAD_PRIORITY), 0, K_NO_WAIT);
|
||||||
#elif defined(CONFIG_PMW3389_TRIGGER_GLOBAL_THREAD)
|
#elif defined(CONFIG_PMW33XX_TRIGGER_GLOBAL_THREAD)
|
||||||
k_work_init(&drv_data->work, pmw3389_work_cb);
|
k_work_init(&drv_data->work, pmw33xx_work_cb);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Add table
Reference in a new issue