Skip to content

Commit 27e8b47

Browse files
committed
plugins/motor_control: Reenable and update to libiio 1.x API
Signed-off-by: Dan Nechita <[email protected]>
1 parent 01641e7 commit 27e8b47

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

Diff for: plugins/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ set(PLUGINS
3737
cn0511
3838
cn0540
3939
pr_config
40-
#motor_control
40+
motor_control
4141
lidar
4242
dmm
4343
debug

Diff for: plugins/motor_control.c

+9-8
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "../osc_plugin.h"
2525
#include "../config.h"
2626
#include "../libini2.c"
27+
#include "../iio_utils.h"
2728

2829
#define THIS_DRIVER "Motor Control"
2930
#define AD_MC_CTRL "ad-mc-ctrl"
@@ -166,7 +167,7 @@ static gboolean update_display(gpointer foo)
166167
iio_chn = iio_device_find_channel(resolver_dev, "angl0", false);
167168
if (!iio_chn)
168169
goto end;
169-
ret = iio_channel_attr_read(iio_chn, "raw", buf, sizeof(buf));
170+
ret = chn_attr_read_raw(iio_chn, "raw", buf, sizeof(buf));
170171
if (ret > 0)
171172
gtk_label_set_text(GTK_LABEL(resolver_angle), buf);
172173
else
@@ -176,7 +177,7 @@ static gboolean update_display(gpointer foo)
176177
false);
177178
if (!iio_chn)
178179
goto end;
179-
ret = iio_channel_attr_read(iio_chn, "raw", buf, sizeof(buf));
180+
ret = chn_attr_read_raw(iio_chn, "raw", buf, sizeof(buf));
180181
if (ret > 0)
181182
gtk_label_set_text(GTK_LABEL(resolver_angle_veloc),
182183
buf);
@@ -276,23 +277,23 @@ static void gpo_toggled_cb(GtkToggleButton *btn, gpointer data)
276277
long long value;
277278

278279
if (pid_devs[PID_1ST_DEV]) {
279-
iio_device_attr_read_longlong(pid_devs[PID_1ST_DEV],
280+
dev_attr_read_longlong(pid_devs[PID_1ST_DEV],
280281
"mc_ctrl_gpo", &value);
281282
if (gtk_toggle_button_get_active(btn))
282283
value |= (1ul << id);
283284
else
284285
value &= ~(1ul << id);
285-
iio_device_attr_write_longlong(pid_devs[PID_1ST_DEV],
286+
dev_attr_write_longlong(pid_devs[PID_1ST_DEV],
286287
"mc_ctrl_gpo", value & gpo_mask);
287288
}
288289
if (adv_dev) {
289-
iio_device_attr_read_longlong(adv_dev,
290+
dev_attr_read_longlong(adv_dev,
290291
"mc_adv_ctrl_gpo", &value);
291292
if (gtk_toggle_button_get_active(btn))
292293
value |= (1ul << id);
293294
else
294295
value &= ~(1ul << id);
295-
iio_device_attr_write_longlong(adv_dev,
296+
dev_attr_write_longlong(adv_dev,
296297
"mc_adv_ctrl_gpo", value & gpo_mask);
297298
}
298299
}
@@ -306,7 +307,7 @@ static void resolver_resolution_update_val(GtkBuilder *builder)
306307

307308
box = GTK_COMBO_BOX(gtk_builder_get_object(builder,
308309
"comboboxtext_resolver_resolution"));
309-
ret = iio_device_attr_read(resolver_dev, "bits", buf,
310+
ret = dev_attr_read_raw(resolver_dev, "bits", buf,
310311
sizeof(buf));
311312
if (ret > 0) {
312313
resolution = atoi(buf);
@@ -329,7 +330,7 @@ static void resolver_resolution_changed_cb(GtkComboBoxText *box,
329330

330331
buf = gtk_combo_box_text_get_active_text(box);
331332
if (buf) {
332-
ret = iio_device_attr_write(resolver_dev, "bits", buf);
333+
ret = dev_attr_write_raw(resolver_dev, "bits", buf, strlen(buf));
333334
if (ret < 0)
334335
printf("write to <bits> attribute failed:%zd\n", ret);
335336
g_free(buf);

0 commit comments

Comments
 (0)