Skip to content

Libiio v1 support more plugins #523

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

Merged
merged 5 commits into from
Feb 13, 2025
Merged

Libiio v1 support more plugins #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fd5b076
plugins: fmcomms6 & 11 - reenable and update to libiio 1.x API
dNechita Feb 7, 2025
74bf32b
plugins: Re-enable the build of DMM and Debug plugins
dNechita Feb 10, 2025
0981ae9
plugins: Re-enable the building of Scpi plugin
dNechita Feb 10, 2025
01641e7
plugins/lidar: Reenable and update to libiio 1.x API
dNechita Feb 10, 2025
27e8b47
plugins/motor_control: Reenable and update to libiio 1.x API
dNechita Feb 10, 2025
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
14 changes: 7 additions & 7 deletions plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ set(PLUGINS
fmcomms2
fmcomms2_adv
fmcomms5
#fmcomms6
#fmcomms11
fmcomms6
fmcomms11
ad9371
ad9371_adv
adrv9009
Expand All @@ -37,12 +37,12 @@ set(PLUGINS
cn0511
cn0540
pr_config
#motor_control
#lidar
#dmm
#debug
motor_control
lidar
dmm
debug
#spectrum_analyzer
#scpi
scpi
ad9081
ad9084
adrv9002
Expand Down
7 changes: 4 additions & 3 deletions plugins/fmcomms11.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <sys/stat.h>
#include <string.h>

#include <iio.h>
#include <iio/iio.h>

#include "../libini2.h"
#include "../osc.h"
Expand All @@ -31,6 +31,7 @@
#include "../eeprom.h"
//#include "./block_diagram.h"
#include "dac_data_manager.h"
#include "../iio_utils.h"

#define THIS_DRIVER "FMCOMMS11"

Expand Down Expand Up @@ -265,7 +266,7 @@ static GtkWidget * fmcomms11_init(struct osc_plugin *plugin, GtkWidget *notebook

ch0 = iio_device_find_channel(adc, "voltage0", false);

if (iio_channel_attr_read_longlong(ch0, "sampling_frequency", &val) == 0)
if (chn_attr_read_longlong(ch0, "sampling_frequency", &val) == 0)
snprintf(attr_val, sizeof(attr_val), "%.2f", (double)(val / 1000000ul));
else
snprintf(attr_val, sizeof(attr_val), "%s", "error");
Expand All @@ -285,7 +286,7 @@ static GtkWidget * fmcomms11_init(struct osc_plugin *plugin, GtkWidget *notebook
/* Tx Widgets */
ch0 = iio_device_find_channel(dac, "altvoltage0", true);

if (iio_channel_attr_read_longlong(ch0, "sampling_frequency", &val) == 0) {
if (chn_attr_read_longlong(ch0, "sampling_frequency", &val) == 0) {
tx_sampling_freq = (double)(val / 1000000ul);
snprintf(attr_val, sizeof(attr_val), "%.2f", tx_sampling_freq);
} else {
Expand Down
27 changes: 14 additions & 13 deletions plugins/lidar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include <iio.h>
#include <iio/iio.h>

#include "../config.h"
#include "../osc.h"
#include "../iio_widget.h"
#include "../osc_plugin.h"
#include "../datatypes.h"
#include "../iio_utils.h"

#define THIS_DRIVER "LIDAR"

Expand Down Expand Up @@ -89,7 +90,7 @@ static void manual_ch_set_cb(void)
gtk_spin_button_get_value_as_int(manual_ch_btns[2]),
gtk_spin_button_get_value_as_int(manual_ch_btns[3]));

iio_device_attr_write_raw(pulse_dev,
dev_attr_write_raw(pulse_dev,
"sequencer_manual_chsel", ch_config, sizeof(ch_config));
}

Expand All @@ -103,7 +104,7 @@ static void auto_cfg_set_cb(void)
gtk_spin_button_get_value_as_int(auto_cfg_btns[2]),
gtk_spin_button_get_value_as_int(auto_cfg_btns[3]));

iio_device_attr_write_raw(pulse_dev,
dev_attr_write_raw(pulse_dev,
"sequencer_auto_cfg", ch_config, sizeof(ch_config));
}

Expand Down Expand Up @@ -186,19 +187,19 @@ static double tilt_volts_to_raw_convert(double value, bool inverse)

static void set_all_iio_atributes_to_default_values()
{
iio_device_attr_write_bool(pulse_dev, "sequencer_en", false);
iio_device_attr_write_raw(pulse_dev, "sequencer_mode", "auto", 5);
iio_device_attr_write_raw(pulse_dev,
dev_attr_write_bool(pulse_dev, "sequencer_en", false);
dev_attr_write_raw(pulse_dev, "sequencer_mode", "auto", 5);
dev_attr_write_raw(pulse_dev,
"sequencer_manual_chsel", "0, 0, 0, 0", 9);
iio_device_attr_write_raw(pulse_dev,
dev_attr_write_raw(pulse_dev,
"sequencer_auto_cfg", "0, 1, 2, 3", 9);
iio_device_attr_write_longlong(pulse_dev, "sequencer_pulse_delay_ns", 248);
iio_channel_attr_write_bool(pulse_ch0, "en", false);
iio_channel_attr_write_longlong(pulse_ch0, "frequency", 50000);
iio_channel_attr_write_longlong(pulse_ch0, "pulse_width_ns", 20);
iio_channel_attr_write_longlong(afe_ch0, "raw",
dev_attr_write_longlong(pulse_dev, "sequencer_pulse_delay_ns", 248);
chn_attr_write_bool(pulse_ch0, "en", false);
chn_attr_write_longlong(pulse_ch0, "frequency", 50000);
chn_attr_write_longlong(pulse_ch0, "pulse_width_ns", 20);
chn_attr_write_longlong(afe_ch0, "raw",
adp_bias_volts_to_raw_convert(-160, false));
iio_channel_attr_write_longlong(afe_ch1, "raw",
chn_attr_write_longlong(afe_ch1, "raw",
tilt_volts_to_raw_convert(0, false));
}

Expand Down
17 changes: 9 additions & 8 deletions plugins/motor_control.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "../osc_plugin.h"
#include "../config.h"
#include "../libini2.c"
#include "../iio_utils.h"

#define THIS_DRIVER "Motor Control"
#define AD_MC_CTRL "ad-mc-ctrl"
Expand Down Expand Up @@ -166,7 +167,7 @@ static gboolean update_display(gpointer foo)
iio_chn = iio_device_find_channel(resolver_dev, "angl0", false);
if (!iio_chn)
goto end;
ret = iio_channel_attr_read(iio_chn, "raw", buf, sizeof(buf));
ret = chn_attr_read_raw(iio_chn, "raw", buf, sizeof(buf));
if (ret > 0)
gtk_label_set_text(GTK_LABEL(resolver_angle), buf);
else
Expand All @@ -176,7 +177,7 @@ static gboolean update_display(gpointer foo)
false);
if (!iio_chn)
goto end;
ret = iio_channel_attr_read(iio_chn, "raw", buf, sizeof(buf));
ret = chn_attr_read_raw(iio_chn, "raw", buf, sizeof(buf));
if (ret > 0)
gtk_label_set_text(GTK_LABEL(resolver_angle_veloc),
buf);
Expand Down Expand Up @@ -276,23 +277,23 @@ static void gpo_toggled_cb(GtkToggleButton *btn, gpointer data)
long long value;

if (pid_devs[PID_1ST_DEV]) {
iio_device_attr_read_longlong(pid_devs[PID_1ST_DEV],
dev_attr_read_longlong(pid_devs[PID_1ST_DEV],
"mc_ctrl_gpo", &value);
if (gtk_toggle_button_get_active(btn))
value |= (1ul << id);
else
value &= ~(1ul << id);
iio_device_attr_write_longlong(pid_devs[PID_1ST_DEV],
dev_attr_write_longlong(pid_devs[PID_1ST_DEV],
"mc_ctrl_gpo", value & gpo_mask);
}
if (adv_dev) {
iio_device_attr_read_longlong(adv_dev,
dev_attr_read_longlong(adv_dev,
"mc_adv_ctrl_gpo", &value);
if (gtk_toggle_button_get_active(btn))
value |= (1ul << id);
else
value &= ~(1ul << id);
iio_device_attr_write_longlong(adv_dev,
dev_attr_write_longlong(adv_dev,
"mc_adv_ctrl_gpo", value & gpo_mask);
}
}
Expand All @@ -306,7 +307,7 @@ static void resolver_resolution_update_val(GtkBuilder *builder)

box = GTK_COMBO_BOX(gtk_builder_get_object(builder,
"comboboxtext_resolver_resolution"));
ret = iio_device_attr_read(resolver_dev, "bits", buf,
ret = dev_attr_read_raw(resolver_dev, "bits", buf,
sizeof(buf));
if (ret > 0) {
resolution = atoi(buf);
Expand All @@ -329,7 +330,7 @@ static void resolver_resolution_changed_cb(GtkComboBoxText *box,

buf = gtk_combo_box_text_get_active_text(box);
if (buf) {
ret = iio_device_attr_write(resolver_dev, "bits", buf);
ret = dev_attr_write_raw(resolver_dev, "bits", buf, strlen(buf));
if (ret < 0)
printf("write to <bits> attribute failed:%zd\n", ret);
g_free(buf);
Expand Down
Loading