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.

Sign up for GitHub

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

Libiio v1 support more plugins #512

Merged
merged 8 commits into from
Dec 11, 2024
Merged

Libiio v1 support more plugins #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
87a07ba
plugins/ad9081: Reenable and update to libiio v1.x
dNechita Dec 10, 2024
15761c7
plugins/ad9084: Reenable and update to libiio v1.x
dNechita Dec 10, 2024
792ea59
plugins/adrv9002: Reenable and update to libiio v1.x
dNechita Dec 10, 2024
d40b050
plugins/ad9371: Reenable and update to libiio v1.x
dNechita Dec 10, 2024
f34da84
plugins/adrv9009: Reenable and update to libiio v1.x
dNechita Dec 10, 2024
13eff02
plugins: Re-enable: ad6676, fmcadc3, pr_config, cf_axi_tdd, xmw, ad56…
dNechita Dec 10, 2024
6d6b9c5
plugins: Re-enable daq2 and update to libiio v1
dNechita Dec 10, 2024
9fe12a2
plugins: Re-enable ad9739a
dNechita Dec 10, 2024
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
30 changes: 15 additions & 15 deletions plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,32 @@ set(PLUGINS
#fmcomms5
#fmcomms6
#fmcomms11
#ad9371
#ad9371_adv
#adrv9009
#adrv9009_adv
#ad6676
#fmcadc3
#daq2
#ad9739a
#AD5628_1
ad9371
ad9371_adv
adrv9009
adrv9009_adv
ad6676
fmcadc3
daq2
ad9739a
AD5628_1
#AD7303
cn0357
cn0508
cn0511
cn0540
#pr_config
pr_config
#motor_control
#lidar
#dmm
#debug
#spectrum_analyzer
#scpi
#ad9081
#ad9084
#adrv9002
#cf_axi_tdd
#xmw
ad9081
ad9084
adrv9002
cf_axi_tdd
xmw
)

set(LIBAD9166_PLUGINS cn0511)
Expand Down
10 changes: 5 additions & 5 deletions plugins/ad9081.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ static void ad9081_label_writer(GtkBuilder *builder, struct iio_channel *voltage
if (!voltage)
return;

ret = iio_channel_attr_read(voltage, "label", buf, sizeof(buf));
ret = chn_attr_read_raw(voltage, "label", buf, sizeof(buf));
if (ret > 0) {
GtkWidget *label;
gchar *text, *id;
Expand Down Expand Up @@ -368,7 +368,7 @@ static void load_pfir(GtkFileChooser *chooser, gpointer data)
if (!buf)
goto err;

ret = iio_device_attr_write_raw(priv->ad9081, "filter_fir_config", buf, size);
ret = dev_attr_write_raw(priv->ad9081, "filter_fir_config", buf, size);
free(buf);
if (ret < 0)
goto err;
Expand Down Expand Up @@ -457,7 +457,7 @@ static GtkWidget *ad9081_init(struct osc_plugin *plugin, GtkWidget *notebook,
if (!ch0)
ch0 = iio_device_find_channel(ad9081_dev, "voltage0", FALSE);

if (ch0 && iio_channel_attr_read_longlong(ch0, "adc_frequency", &adc_freq) == 0)
if (ch0 && chn_attr_read_longlong(ch0, "adc_frequency", &adc_freq) == 0)
snprintf(attr_val, sizeof(attr_val), "%.2f",
(double)(adc_freq / 1000000ul));
else
Expand Down Expand Up @@ -488,7 +488,7 @@ static GtkWidget *ad9081_init(struct osc_plugin *plugin, GtkWidget *notebook,
if (!ch0)
ch0 = iio_device_find_channel(ad9081_dev, "voltage0", TRUE);

if (ch0 && iio_channel_attr_read_longlong(ch0, "dac_frequency", &dac_freq) == 0)
if (ch0 && chn_attr_read_longlong(ch0, "dac_frequency", &dac_freq) == 0)
snprintf(attr_val, sizeof(attr_val), "%.2f",
(double)(dac_freq / 1000000ul));
else
Expand Down Expand Up @@ -583,7 +583,7 @@ static GtkWidget *ad9081_init(struct osc_plugin *plugin, GtkWidget *notebook,
gtk_widget_show_all(dds_container);

ch0 = iio_device_find_channel(dac, "altvoltage0", true);
if (iio_channel_attr_read_longlong(ch0, "sampling_frequency", &dac_freq) == 0)
if (chn_attr_read_longlong(ch0, "sampling_frequency", &dac_freq) == 0)
dac_tx_sampling_freq = (double)(dac_freq / 1000000ul);

dac_data_manager_freq_widgets_range_update(priv->dac_tx_manager,
Expand Down
12 changes: 6 additions & 6 deletions plugins/ad9084.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ static void ad9084_label_writer(GtkBuilder *builder, struct iio_channel *voltage
if (!voltage)
return;

ret = iio_channel_attr_read(voltage, "label", buf, sizeof(buf));
ret = chn_attr_read_raw(voltage, "label", buf, sizeof(buf));
if (ret > 0) {
GtkWidget *label;
gchar *text, *id;
Expand Down Expand Up @@ -391,7 +391,7 @@ static void load_pfir(GtkFileChooser *chooser, gpointer data)
if (!buf)
goto err;

ret = iio_device_attr_write_raw(priv->ad9084, "pfilt_config", buf, size);
ret = dev_attr_write_raw(priv->ad9084, "pfilt_config", buf, size);
free(buf);
if (ret < 0)
goto err;
Expand Down Expand Up @@ -425,7 +425,7 @@ static void load_cfir(GtkFileChooser *chooser, gpointer data)
if (!buf)
goto err;

ret = iio_device_attr_write_raw(priv->ad9084, "cfir_config", buf, size);
ret = dev_attr_write_raw(priv->ad9084, "cfir_config", buf, size);
free(buf);
if (ret < 0)
goto err;
Expand Down Expand Up @@ -521,7 +521,7 @@ static GtkWidget *ad9084_init(struct osc_plugin *plugin, GtkWidget *notebook,
if (!ch0)
ch0 = iio_device_find_channel(ad9084_dev, "voltage0", FALSE);

if (ch0 && iio_channel_attr_read_longlong(ch0, "adc_frequency", &adc_freq) == 0)
if (ch0 && chn_attr_read_longlong(ch0, "adc_frequency", &adc_freq) == 0)
snprintf(attr_val, sizeof(attr_val), "%.2f",
(double)(adc_freq / 1000000ul));
else
Expand Down Expand Up @@ -552,7 +552,7 @@ static GtkWidget *ad9084_init(struct osc_plugin *plugin, GtkWidget *notebook,
if (!ch0)
ch0 = iio_device_find_channel(ad9084_dev, "voltage0", TRUE);

if (ch0 && iio_channel_attr_read_longlong(ch0, "dac_frequency", &dac_freq) == 0)
if (ch0 && chn_attr_read_longlong(ch0, "dac_frequency", &dac_freq) == 0)
snprintf(attr_val, sizeof(attr_val), "%.2f",
(double)(dac_freq / 1000000ul));
else
Expand Down Expand Up @@ -647,7 +647,7 @@ static GtkWidget *ad9084_init(struct osc_plugin *plugin, GtkWidget *notebook,
gtk_widget_show_all(dds_container);

ch0 = iio_device_find_channel(dac, "altvoltage0", true);
if (iio_channel_attr_read_longlong(ch0, "sampling_frequency", &dac_freq) == 0)
if (chn_attr_read_longlong(ch0, "sampling_frequency", &dac_freq) == 0)
dac_tx_sampling_freq = (double)(dac_freq / 1000000ul);

dac_data_manager_freq_widgets_range_update(priv->dac_tx_manager,
Expand Down
53 changes: 27 additions & 26 deletions plugins/ad9371.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "../iio_utils.h"
#include "block_diagram.h"
#include "dac_data_manager.h"
#include "../iio_utils.h"
//#include "fir_filter.h"
//#include "scpi.h"

Expand Down Expand Up @@ -334,7 +335,7 @@ static void update_lable_from(GtkWidget *label, const char *channel,
char buf[80];
long long val = 0;

int ret = iio_channel_attr_read_longlong(
int ret = chn_attr_read_longlong(
iio_device_find_channel(dev, channel, output),
attribute, &val);

Expand All @@ -360,7 +361,7 @@ static void update_lable_from_prms(GtkWidget *label, const char *channel,
char buf[80];
long long val = 0;

int ret = iio_channel_attr_read_longlong(
int ret = chn_attr_read_longlong(
iio_device_find_channel(dev, channel, output),
attribute, &val);

Expand All @@ -378,7 +379,7 @@ static void update_dpd_status_from(GtkWidget *label, const char *channel,
{
long long val = 0;

int ret = iio_channel_attr_read_longlong(
int ret = chn_attr_read_longlong(
iio_device_find_channel(dev, channel, true),
attribute, &val);

Expand All @@ -394,7 +395,7 @@ static void update_vswr_status_from(GtkWidget *label, const char *channel,
{
long long val = 0;

int ret = iio_channel_attr_read_longlong(
int ret = chn_attr_read_longlong(
iio_device_find_channel(dev, channel, true),
attribute, &val);

Expand All @@ -410,7 +411,7 @@ static void update_clgc_status_from(GtkWidget *label, const char *channel,
{
long long val = 0;

int ret = iio_channel_attr_read_longlong(
int ret = chn_attr_read_longlong(
iio_device_find_channel(dev, channel, true),
attribute, &val);

Expand Down Expand Up @@ -544,10 +545,10 @@ int load_myk_profile(const char *file_name,

iio_context_set_timeout(ctx, 30000);

ret = iio_device_attr_write_raw(dev1,
ret = dev_attr_write_raw(dev1,
"profile_config", buf, len);
if (dev2) {
ret2 = iio_device_attr_write_raw(dev2,
ret2 = dev_attr_write_raw(dev2,
"profile_config", buf, len);
ret = (ret > ret2) ? ret2 : ret;
}
Expand Down Expand Up @@ -599,13 +600,13 @@ static void glb_settings_update_labels(void)
char buf[1024];
ssize_t ret;

ret = iio_device_attr_read(dev, "ensm_mode", buf, sizeof(buf));
ret = dev_attr_read_raw(dev, "ensm_mode", buf, sizeof(buf));
if (ret > 0)
gtk_label_set_text(GTK_LABEL(ensm_mode), buf);
else
gtk_label_set_text(GTK_LABEL(ensm_mode), "<error>");

ret = iio_channel_attr_read(
ret = chn_attr_read_raw(
iio_device_find_channel(dev, "voltage0", false),
"gain_control_mode", buf, sizeof(buf));
if (ret > 0)
Expand All @@ -614,7 +615,7 @@ static void glb_settings_update_labels(void)
gtk_label_set_text(GTK_LABEL(rx_gain_control_rx1), "<error>");

if (is_2rx_2tx) {
ret = iio_channel_attr_read(
ret = chn_attr_read_raw(
iio_device_find_channel(dev, "voltage1", false),
"gain_control_mode", buf, sizeof(buf));
if (ret > 0)
Expand All @@ -623,7 +624,7 @@ static void glb_settings_update_labels(void)
gtk_label_set_text(GTK_LABEL(rx_gain_control_rx2), "<error>");
}

ret = iio_channel_attr_read(
ret = chn_attr_read_raw(
iio_device_find_channel(dev, "voltage2", false),
"gain_control_mode", buf, sizeof(buf));
if (ret > 0)
Expand Down Expand Up @@ -690,7 +691,7 @@ static void rssi_update_label(GtkWidget *label, const char *chn, bool is_tx)
if (!gtk_widget_is_drawable(GTK_WIDGET(label)))
return;

ret = iio_channel_attr_read(
ret = chn_attr_read_raw(
iio_device_find_channel(dev, chn, is_tx),
"rssi", buf, sizeof(buf));
if (ret > 0)
Expand Down Expand Up @@ -792,11 +793,11 @@ static void updn_converter_lo_freq_changed_cb(GtkSpinButton *button, int data)

target_freq = gtk_spin_button_get_value(button);
split_target_lo_freq(target_freq, &updn_pll, &ad9371_lo, updn_freq_span, center_freq);
ret = iio_channel_attr_write_longlong(ad9371_ch, freq_name, (long long)MHZ_TO_HZ(ad9371_lo));
ret = chn_attr_write_longlong(ad9371_ch, freq_name, (long long)MHZ_TO_HZ(ad9371_lo));
if (ret < 0)
fprintf(stderr,"Write to %s attribute of %s device: %s\n",
freq_name, PHY_DEVICE, strerror(-ret));
ret = iio_channel_attr_write_longlong(updn_ch, "frequency", (long long)MHZ_TO_HZ(updn_pll));
ret = chn_attr_write_longlong(updn_ch, "frequency", (long long)MHZ_TO_HZ(updn_pll));
if (ret < 0)
fprintf(stderr,"Write to %s attribute of %s device: %s\n",
"frequency", (UPDN_TX) ? UDC_TX_DEVICE : UDC_RX_DEVICE, strerror(-ret));
Expand Down Expand Up @@ -862,10 +863,10 @@ static void rx_phase_rotation_update()
}

for (i = 0; i <= d; i += 2) {
iio_channel_attr_read_double(out[i], "calibscale", &val[0]);
iio_channel_attr_read_double(out[i], "calibphase", &val[1]);
iio_channel_attr_read_double(out[i + 1], "calibscale", &val[2]);
iio_channel_attr_read_double(out[i + 1], "calibphase", &val[3]);
chn_attr_read_double(out[i], "calibscale", &val[0]);
chn_attr_read_double(out[i], "calibphase", &val[1]);
chn_attr_read_double(out[i + 1], "calibscale", &val[2]);
chn_attr_read_double(out[i + 1], "calibphase", &val[3]);

val[0] = acos(val[0]) * 360.0 / (2.0 * M_PI);
val[1] = asin(-1.0 * val[1]) * 360.0 / (2.0 * M_PI);
Expand Down Expand Up @@ -984,14 +985,14 @@ static void int_dec_freq_update(void)
gchar *text;

ch = iio_device_find_channel(cap, "voltage0_i", false);
iio_channel_attr_read_double(ch, "sampling_frequency", &freq);
chn_attr_read_double(ch, "sampling_frequency", &freq);

text = g_strdup_printf ("%f", freq / mhz_scale);
gtk_label_set_text(GTK_LABEL(label_sampling_freq_rx), text);
g_free(text);

ch = iio_device_find_channel(dds, "voltage0", true);
iio_channel_attr_read_double(ch, "sampling_frequency", &freq);
chn_attr_read_double(ch, "sampling_frequency", &freq);

text = g_strdup_printf ("%f", freq / mhz_scale);
gtk_label_set_text(GTK_LABEL(label_sampling_freq_tx), g_strdup_printf ("%f", freq / mhz_scale));
Expand Down Expand Up @@ -1039,10 +1040,10 @@ static void rx_phase_rotation_set(GtkSpinButton *spinbutton, gpointer user_data)
}

if (out1 && out0) {
iio_channel_attr_write_double(out0, "calibscale", (double) cos(phase));
iio_channel_attr_write_double(out0, "calibphase", (double) (-1 * sin(phase)));
iio_channel_attr_write_double(out1, "calibscale", (double) cos(phase));
iio_channel_attr_write_double(out1, "calibphase", (double) sin(phase));
chn_attr_write_double(out0, "calibscale", (double) cos(phase));
chn_attr_write_double(out0, "calibphase", (double) (-1 * sin(phase)));
chn_attr_write_double(out1, "calibscale", (double) cos(phase));
chn_attr_write_double(out1, "calibphase", (double) sin(phase));
}
}

Expand Down Expand Up @@ -1223,15 +1224,15 @@ static void load_profile(struct osc_plugin *plugin, const char *ini_fn)
value = read_token_from_ini(ini_fn, THIS_DRIVER,
PHY_DEVICE".in_voltage0_gain_control_mode");
if (ch && value) {
iio_channel_attr_write(ch, "gain_control_mode", value);
chn_attr_write_string(ch, "gain_control_mode", value);
free(value);
}

ch = iio_device_find_channel(dev, "voltage1", false);
value = read_token_from_ini(ini_fn, THIS_DRIVER,
PHY_DEVICE".in_voltage1_gain_control_mode");
if (ch && value) {
iio_channel_attr_write(ch, "gain_control_mode", value);
chn_attr_write_string(ch, "gain_control_mode", value);
free(value);
}

Expand Down
Loading
Loading