Skip to content

Commit

Permalink
Add probe and calibration apis through attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
@anujdeshpande
anujdeshpande committed Aug 26, 2024
1 parent 761851d commit 52ced2e
Show file tree
Hide file tree
Showing 3 changed files with 137 additions and 111 deletions.
187 changes: 102 additions & 85 deletions drivers/sensor/oemec/oemec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,139 +52,156 @@ LOG_MODULE_REGISTER(OEMEC, CONFIG_SENSOR_LOG_LEVEL);
#define OEMEC_SALINITY_LSB 0x23

struct oemec_config {
struct i2c_dt_spec bus;
/* uint8_t resolution; */
/* uint8_t mtreg; */
struct i2c_dt_spec bus;
/* uint8_t resolution; */
/* uint8_t mtreg; */
};

struct oemec_data {
float sample;
float sample;
};

static int oemec_read_regs(const struct device *dev, uint8_t addr, void *buf, size_t len)
{
const struct oemec_config *config = dev->config;
int err;
const struct oemec_config *config = dev->config;
int err;

err = i2c_write_read_dt(&config->bus, &addr, sizeof(addr), buf, len);
if (err != 0) {
LOG_ERR("failed to read reg addr 0x%02x, len %d (err %d)", addr, len, err);
return err;
}
err = i2c_write_read_dt(&config->bus, &addr, sizeof(addr), buf, len);
if (err != 0) {
LOG_ERR("failed to read reg addr 0x%02x, len %d (err %d)", addr, len, err);
return err;
}

return 0;
return 0;
}

static int oemec_write_regs(const struct device *dev, uint8_t addr, void *buf, size_t len)
{
const struct oemec_config *config = dev->config;
uint8_t block[sizeof(addr) + len];
int err;
const struct oemec_config *config = dev->config;
uint8_t block[sizeof(addr) + len];
int err;

block[0] = addr;
memcpy(&block[1], buf, len);
block[0] = addr;
memcpy(&block[1], buf, len);

err = i2c_write_dt(&config->bus, block, sizeof(block));
if (err != 0) {
LOG_ERR("failed to write reg addr 0x%02x, len %d (err %d)", addr, len, err);
return err;
}
err = i2c_write_dt(&config->bus, block, sizeof(block));
if (err != 0) {
LOG_ERR("failed to write reg addr 0x%02x, len %d (err %d)", addr, len, err);
return err;
}

return 0;
return 0;
}

static int oemec_sample_fetch(const struct device *dev, enum sensor_channel chan)
{
LOG_INF("Fetching samples");
/* Initiate sensor read */

/* uint8_t devicetype_firmware[2]={0,0}; */
/* oemec_read_regs(dev,OEMEC_DEVICE_TYPE,&devicetype_firmware,sizeof(devicetype_firmware)); */
/* LOG_INF("Device type : %d",devicetype_firmware[0]); */
/* LOG_INF("FW version : %d", devicetype_firmware[1]); */

/* Get the values */

uint8_t sensor_values[4]={1,2,3,4};
unsigned long sensor_values_long=0;
float sensor_values_float;
oemec_read_regs(dev,OEMEC_SENSOR_MSB,&sensor_values,sizeof(sensor_values));

sensor_values_long += sensor_values[0] << 24;
sensor_values_long += sensor_values[1] << 16;
sensor_values_long += sensor_values[2] << 8;
sensor_values_long += sensor_values[3];

sensor_values_float = (float)sensor_values_long;
sensor_values_float = sensor_values_float/100;
LOG_INF("Sensor values as 4 regs :%x %x %x %x",sensor_values[0],sensor_values[1],sensor_values[2],sensor_values[3]);
LOG_INF("Sensor value as long %lu",sensor_values_long);
LOG_INF("Sensor value as float %f",sensor_values_float);
return 0;
LOG_INF("Fetching samples");
/* Initiate sensor read */

/* uint8_t devicetype_firmware[2]={0,0}; */
/* oemec_read_regs(dev,OEMEC_DEVICE_TYPE,&devicetype_firmware,sizeof(devicetype_firmware)); */
/* LOG_INF("Device type : %d",devicetype_firmware[0]); */
/* LOG_INF("FW version : %d", devicetype_firmware[1]); */

/* Get the values */

uint8_t sensor_values[4]={1,2,3,4};
unsigned long sensor_values_long=0;
float sensor_values_float;
oemec_read_regs(dev,OEMEC_SENSOR_MSB,&sensor_values,sizeof(sensor_values));

sensor_values_long += sensor_values[0] << 24;
sensor_values_long += sensor_values[1] << 16;
sensor_values_long += sensor_values[2] << 8;
sensor_values_long += sensor_values[3];

sensor_values_float = (float)sensor_values_long;
sensor_values_float = sensor_values_float/100;

LOG_INF("Sensor values as 4 regs :%x %x %x %x",sensor_values[0],sensor_values[1],sensor_values[2],sensor_values[3]);
LOG_INF("Sensor value as long %lu",sensor_values_long);
LOG_INF("Sensor value as float %f",sensor_values_float);

return 0;
}

static int oemec_set_probe()
static int oemec_set_probe(const struct device *dev,const struct sensor_value *val)
{
return 0;
int t = val->val1;
uint8_t LSB = ((uint16_t)t & 0x00FF);
uint8_t MSB = (((uint16_t)t & 0xFF00) >>8);
LOG_INF("Setting probe regs to %d i.e. | %02x | %02x",t,MSB,LSB);
oemec_write_regs(dev,OEMEC_PROBE_MSB,&MSB,sizeof(MSB));
oemec_write_regs(dev,OEMEC_PROBE_LSB,&LSB,sizeof(LSB));
return 0;
}

static int oemec_set_calibration()
static int oemec_set_calibration(const struct device *dev, const struct sensor_value *val)
{
return 0;
uint32_t t = (uint32_t)val->val1;

uint8_t MSB = ((t & 0xFF000000) >>24);
uint8_t highbyte = ((t & 0x00FF0000) >>16);
uint8_t lowbyte = ((t & 0x0000FF00) >>8);
uint8_t LSB = (t & 0x000000FF);
LOG_INF("Setting calibration regs to %d i.e. | %02x | %02x | %02x | %02x",t,MSB,highbyte,lowbyte,LSB);
oemec_write_regs(dev,OEMEC_CALIB_MSB,&MSB,sizeof(MSB));
oemec_write_regs(dev,OEMEC_CALIB_HIGH_BYTE,&highbyte,sizeof(highbyte));
oemec_write_regs(dev,OEMEC_CALIB_LOW_BYTE,&lowbyte,sizeof(lowbyte));
oemec_write_regs(dev,OEMEC_CALIB_LSB,&LSB,sizeof(LSB));
return 0;
}

static int oemec_channel_get(const struct device *dev, enum sensor_channel chan,
struct sensor_value *val)
struct sensor_value *val)
{
LOG_INF("Fetching value for channel %d", chan);
return 0;
LOG_INF("Fetching value for channel %d", chan);
return 0;
}

static int oemec_attr_get(const struct device *dev, enum sensor_channel chan,
enum sensor_attribute attr, struct sensor_value *val)
enum sensor_attribute attr, struct sensor_value *val)
{
return 0;
return 0;
}

static int oemec_attr_set(const struct device *dev, enum sensor_channel chan,
enum sensor_attribute attr, const struct sensor_value *val)
enum sensor_attribute attr, const struct sensor_value *val)
{
switch(attr){
case SENSOR_ATTR_CALIBRATION:
return oemec_set_calibration();
case SENSOR_ATTR_OEMEC_PROBE:
return oemec_set_probe();
default:
LOG_ERR("Attribute not supported");
return -ENOTSUP;
}
return 0;
switch(attr){
case SENSOR_ATTR_CALIBRATION:
return oemec_set_calibration(dev,val);
case SENSOR_ATTR_OEMEC_PROBE:
return oemec_set_probe(dev,val);
default:
LOG_ERR("Attribute not supported");
return -ENOTSUP;

}
return 0;
}

static const struct sensor_driver_api oemec_driver_api = {
.sample_fetch = oemec_sample_fetch,
.channel_get = oemec_channel_get,
.attr_set = oemec_attr_set,
.attr_get = oemec_attr_get,
.sample_fetch = oemec_sample_fetch,
.channel_get = oemec_channel_get,
.attr_set = oemec_attr_set,
.attr_get = oemec_attr_get,
};

static int oemec_init(const struct device *dev)
{
LOG_DBG("Inside oemec_init");
return 0;
LOG_DBG("Inside oemec_init");
return 0;
}

#define DEFINE_OEMEC(inst) \
static struct oemec_data oemec_data_##inst; \
static struct oemec_data oemec_data_##inst; \
\
static const struct oemec_config oemec_config_##inst = { \
.bus = I2C_DT_SPEC_INST_GET(inst), \
}; \
SENSOR_DEVICE_DT_INST_DEFINE(inst, oemec_init, NULL, &oemec_data_##inst, \
&oemec_config_##inst, POST_KERNEL, \
CONFIG_SENSOR_INIT_PRIORITY, &oemec_driver_api);
static const struct oemec_config oemec_config_##inst = { \
.bus = I2C_DT_SPEC_INST_GET(inst), \
}; \
SENSOR_DEVICE_DT_INST_DEFINE(inst, oemec_init, NULL, &oemec_data_##inst, \
&oemec_config_##inst, POST_KERNEL, \
CONFIG_SENSOR_INIT_PRIORITY, &oemec_driver_api);

DT_INST_FOREACH_STATUS_OKAY(DEFINE_OEMEC)
6 changes: 3 additions & 3 deletions drivers/sensor/oemec/oemec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
extern "C" {
#endif

enum sensor_channel_oemec{
SENSOR_CHAN_OEMEC_CONDUCTIVITY = SENSOR_CHAN_PRIV_START,
enum sensor_channel_oemec{
SENSOR_CHAN_OEMEC_CONDUCTIVITY = SENSOR_CHAN_PRIV_START,
};

enum sensor_attribute_oemec{
enum sensor_attribute_oemec{
SENSOR_ATTR_OEMEC_PROBE = SENSOR_ATTR_PRIV_START,
};

Expand Down
55 changes: 32 additions & 23 deletions examples/simple/src/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,38 @@ LOG_MODULE_REGISTER(simple_app);

int main(void)
{
int rc;
LOG_INF("Running OEMEC simple app on %s\n", CONFIG_BOARD);
const struct device *dev = DEVICE_DT_GET_ANY(atlas_oemec);
if (dev == NULL) {
LOG_INF("No device found");
return 0;
}
LOG_INF("Setting attributes");
int rc;
LOG_INF("Running OEMEC simple app on %s\n", CONFIG_BOARD);
const struct device *dev = DEVICE_DT_GET_ANY(atlas_oemec);
if (dev == NULL) {
LOG_INF("No device found");
return 0;
}
LOG_INF("Setting attributes");
struct sensor_value probe = { // K=4.56
.val1 = 456,
};

struct sensor_value conductivity;
sensor_attr_set(dev,SENSOR_CHAN_OEMEC_CONDUCTIVITY,SENSOR_ATTR_OEMEC_PROBE,&conductivity);
while (true) {
rc = sensor_sample_fetch(dev);
if (rc != 0 ){
LOG_ERR("OEMEC failed: %d",rc);
break;
}
else { // read channels
rc = sensor_channel_get(dev, SENSOR_CHAN_OEMEC_CONDUCTIVITY, &conductivity);
LOG_INF("Conductivity value %f", sensor_value_to_double(&conductivity));
}
k_msleep(2000);
}
rc = sensor_attr_set(dev,SENSOR_CHAN_OEMEC_CONDUCTIVITY,SENSOR_ATTR_OEMEC_PROBE,&probe);
LOG_INF("Set probe returned %d",rc);
struct sensor_value calib = { // K=150,000.00uS
.val1 = 15000000, //x 100
};
rc = sensor_attr_set(dev,SENSOR_CHAN_OEMEC_CONDUCTIVITY,SENSOR_ATTR_CALIBRATION,&calib);

return 0;
struct sensor_value conductivity;
while (true) {
rc = sensor_sample_fetch(dev);
if (rc != 0 ){
LOG_ERR("OEMEC failed: %d",rc);
break;
}
else { // read channels
rc = sensor_channel_get(dev, SENSOR_CHAN_OEMEC_CONDUCTIVITY, &conductivity);
LOG_INF("Conductivity value %f", sensor_value_to_double(&conductivity));
}
k_msleep(2000);
}

return 0;
}

0 comments on commit 52ced2e

Please sign in to comment.