kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove attr set

Browse source
This commit is contained in:
crides 2022-11-27 19:53:02 -06:00
parent e72d668648
commit ecf60a316c
2 changed files with 1 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/drivers/sensor/cirque_trackpad/cirque_trackpad.c
View file

@ -2,7 +2,6 @@
#include <init.h> #include <init.h>
#include <drivers/sensor.h> #include <drivers/sensor.h>
#include <zmk/sensors.h>
#include <logging/log.h> #include <logging/log.h>
#include "cirque_trackpad.h" #include "cirque_trackpad.h"
@ -94,17 +93,6 @@ static int pinnacle_channel_get(const struct device *dev, enum sensor_channel ch
return 0; return 0;
} }
static int pinnacle_attr_set(const struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) {
const struct pinnacle_config *config = dev->config;
if (attr == SENSOR_ATTR_PINNACLE_GE) {
const uint8_t ge_set = val->val1 ? 0 : PINNACLE_FEED_CFG2_DIS_GE;
const uint8_t taps_set = config->no_taps ? PINNACLE_FEED_CFG2_DIS_TAP : 0;
pinnacle_write(dev, PINNACLE_FEED_CFG2, ge_set | taps_set);
return 0;
}
return -ENOTSUP;
}
static int pinnacle_sample_fetch(const struct device *dev, enum sensor_channel chan) { static int pinnacle_sample_fetch(const struct device *dev, enum sensor_channel chan) {
uint8_t packet[3]; uint8_t packet[3];
int res = pinnacle_seq_read(dev, PINNACLE_2_2_PACKET0, packet, 3); int res = pinnacle_seq_read(dev, PINNACLE_2_2_PACKET0, packet, 3);
@ -234,13 +222,12 @@ static const struct sensor_driver_api pinnacle_driver_api = {
#endif #endif
.sample_fetch = pinnacle_sample_fetch, .sample_fetch = pinnacle_sample_fetch,
.channel_get = pinnacle_channel_get, .channel_get = pinnacle_channel_get,
.attr_set = pinnacle_attr_set,
}; };
#define CIRQUE_INST(n) \ #define CIRQUE_INST(n) \
static struct pinnacle_data pinnacle_data_##n; \ static struct pinnacle_data pinnacle_data_##n; \
static const struct pinnacle_config pinnacle_config_##n = { \ static const struct pinnacle_config pinnacle_config_##n = { \
.bus = COND_CODE_1(DT_INST_ON_BUS(0, i2c), I2C_DT_SPEC_INST_GET(0), (SPI_DT_SPEC_INST_GET(0, SPI_OP_MODE_MASTER | SPI_WORD_SET(8) | SPI_LINES_SINGLE | SPI_TRANSFER_MSB, 0))), \ .bus = COND_CODE_1(DT_INST_ON_BUS(0, i2c), (I2C_DT_SPEC_INST_GET(0)), (SPI_DT_SPEC_INST_GET(0, SPI_OP_MODE_MASTER | SPI_WORD_SET(8) | SPI_LINES_SINGLE | SPI_TRANSFER_MSB, 0))), \
.invert_x = DT_INST_PROP(0, invert_x), \ .invert_x = DT_INST_PROP(0, invert_x), \
.invert_y = DT_INST_PROP(0, invert_y), \ .invert_y = DT_INST_PROP(0, invert_y), \
.sleep_en = DT_INST_PROP(0, sleep), \ .sleep_en = DT_INST_PROP(0, sleep), \

7
app/include/zmk/sensors.h
View file

@ -10,10 +10,3 @@
#define ZMK_KEYMAP_HAS_SENSORS DT_NODE_HAS_STATUS(ZMK_KEYMAP_SENSORS_NODE, okay) #define ZMK_KEYMAP_HAS_SENSORS DT_NODE_HAS_STATUS(ZMK_KEYMAP_SENSORS_NODE, okay)
#define ZMK_KEYMAP_SENSORS_LEN DT_PROP_LEN(ZMK_KEYMAP_SENSORS_NODE, sensors) #define ZMK_KEYMAP_SENSORS_LEN DT_PROP_LEN(ZMK_KEYMAP_SENSORS_NODE, sensors)
#define ZMK_KEYMAP_SENSORS_BY_IDX(idx) DT_PHANDLE_BY_IDX(ZMK_KEYMAP_SENSORS_NODE, sensors, idx) #define ZMK_KEYMAP_SENSORS_BY_IDX(idx) DT_PHANDLE_BY_IDX(ZMK_KEYMAP_SENSORS_NODE, sensors, idx)
#include <drivers/sensor.h>
enum {
// Cirque Pinnacle Glide Extend
SENSOR_ATTR_PINNACLE_GE = SENSOR_ATTR_PRIV_START,
};