Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Sensor API #23

Merged
merged 3 commits into from
Jun 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
170 changes: 170 additions & 0 deletions PlutoSDR_Settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,176 @@ bool SoapyPlutoSDR::getFullDuplex( const int direction, const size_t channel ) c
return(true);
}


/*******************************************************************
* Sensor API
******************************************************************/

bool SoapyPlutoSDR::is_sensor_channel(struct iio_channel *chn) const
{
return (!iio_channel_is_output(chn) &&
(iio_channel_find_attr(chn, "raw") ||
iio_channel_find_attr(chn, "input")));
}

double SoapyPlutoSDR::double_from_buf(const char *buf) const
{
std::istringstream val_as_string(buf);
val_as_string.imbue(std::locale::classic()); // ignore global C++ locale

double val = 0.0;
val_as_string >> val;

return val;
}

double SoapyPlutoSDR::get_sensor_value(struct iio_channel *chn) const
{
char buf[32];
double val = 0.0;

if (iio_channel_find_attr(chn, "input")) {
if (iio_channel_attr_read(chn, "input", buf, sizeof(buf)) > 0) {
val = double_from_buf(buf);
}
} else {
if (iio_channel_attr_read(chn, "raw", buf, sizeof(buf)) > 0) {
val = double_from_buf(buf);
}

if (iio_channel_find_attr(chn, "offset")) {
if (iio_channel_attr_read(chn, "offset", buf, sizeof(buf)) > 0) {
val += double_from_buf(buf);
}
}

if (iio_channel_find_attr(chn, "scale")) {
if (iio_channel_attr_read(chn, "scale", buf, sizeof(buf)) > 0) {
val *= double_from_buf(buf);
}
}
}

return val / 1000.0;
}

std::string SoapyPlutoSDR::id_to_unit(const std::string& id) const
{
static std::map<std::string, std::string> id_to_unit_table = {
{ "current", "A" },
{ "power", "W" },
{ "temp", "C" },
{ "voltage", "V" },
};

for (auto it_match : id_to_unit_table) {

//if the id starts with a known prefix, retreive its unit.
if (id.substr(0, it_match.first.size()) == it_match.first) {
return it_match.second;
}
}
return std::string();
}

std::vector<std::string> SoapyPlutoSDR::listSensors(void) const
{
/*
iio:device2: xadc
10 channels found:
temp0: (input)
voltage0: vccint (input)
voltage1: vccaux (input)
voltage2: vccbram (input)
voltage3: vccpint (input)
voltage4: vccpaux (input)
voltage5: vccoddr (input)
voltage6: vrefp (input)
voltage7: vrefn (input)
voltage8: (input)
iio:device0: adm1177
2 channels found:
current0: (input)
voltage0: (input)
iio:device1: ad9361-phy
9 channels found:
temp0: (input)
voltage2: (input)
*/
std::vector<std::string> sensors;

sensors.push_back("xadc_temp0");
sensors.push_back("xadc_voltage0");
sensors.push_back("xadc_voltage1");
sensors.push_back("xadc_voltage2");
sensors.push_back("xadc_voltage3");
sensors.push_back("xadc_voltage4");
sensors.push_back("xadc_voltage5");
sensors.push_back("xadc_voltage6");
sensors.push_back("xadc_voltage7");
sensors.push_back("xadc_voltage8");
sensors.push_back("adm1177_current0");
sensors.push_back("adm1177_voltage0");
sensors.push_back("ad9361-phy_temp0");
sensors.push_back("ad9361-phy_voltage2");

return sensors;
}

SoapySDR::ArgInfo SoapyPlutoSDR::getSensorInfo(const std::string &key) const
{
SoapySDR::ArgInfo info;

std::size_t dash = key.find("_");
if (dash < std::string::npos)
{
std::string deviceStr = key.substr(0, dash);
std::string channelStr = key.substr(dash + 1);

iio_device *dev = iio_context_find_device(ctx, deviceStr.c_str());
if (!dev)
return info;
iio_channel *chn = iio_device_find_channel(dev, channelStr.c_str(), false);
if (!chn)
return info;

const char *name = iio_channel_get_name(chn);
info.key = key;
if (name)
info.name = name;
info.type = SoapySDR::ArgInfo::FLOAT;
info.value = "0.0";
info.units = id_to_unit(channelStr);
}

return info;
}

std::string SoapyPlutoSDR::readSensor(const std::string &key) const
{
std::string sensorValue;

std::size_t dash = key.find("_");
if (dash < std::string::npos)
{
std::string deviceStr = key.substr(0, dash);
std::string channelStr = key.substr(dash + 1);

iio_device *dev = iio_context_find_device(ctx, deviceStr.c_str());
if (!dev)
return sensorValue;
iio_channel *chn = iio_device_find_channel(dev, channelStr.c_str(), false);
if (!chn)
return sensorValue;

double value = get_sensor_value(chn);
sensorValue.assign(std::to_string(value));
}

return sensorValue;
}


/*******************************************************************
* Settings API
******************************************************************/
Expand Down
16 changes: 16 additions & 0 deletions SoapyPlutoSDR.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,17 @@ class SoapyPlutoSDR : public SoapySDR::Device{
);


/*******************************************************************
* Sensor API
******************************************************************/

std::vector<std::string> listSensors(void) const;

SoapySDR::ArgInfo getSensorInfo(const std::string &key) const;

std::string readSensor(const std::string &key) const;


/*******************************************************************
* Settings API
******************************************************************/
Expand Down Expand Up @@ -292,6 +303,11 @@ class SoapyPlutoSDR : public SoapySDR::Device{
bool IsValidRxStreamHandle(SoapySDR::Stream* handle) const;
bool IsValidTxStreamHandle(SoapySDR::Stream* handle);

bool is_sensor_channel(struct iio_channel *chn) const;
double double_from_buf(const char *buf) const;
double get_sensor_value(struct iio_channel *chn) const;
std::string id_to_unit(const std::string &id) const;

iio_device *dev;
iio_device *rx_dev;
iio_device *tx_dev;
Expand Down