Skip to content

Commit a0b13a9

Browse files
committed
plugins: Re-enable daq2 and update to libiio v1
Signed-off-by: Dan <[email protected]>
1 parent 035bd45 commit a0b13a9

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

plugins/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ set(PLUGINS
2828
adrv9009_adv
2929
ad6676
3030
fmcadc3
31-
#daq2
31+
daq2
3232
#ad9739a
3333
AD5628_1
3434
#AD7303

plugins/daq2.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121
#include <sys/stat.h>
2222
#include <string.h>
2323

24-
#include <iio.h>
24+
#include <iio/iio.h>
2525

26+
#include "../iio_utils.h"
2627
#include "../libini2.h"
2728
#include "../osc.h"
2829
#include "../iio_widget.h"
@@ -296,7 +297,7 @@ static GtkWidget * daq2_init(struct osc_plugin *plugin, GtkWidget *notebook, con
296297
ch0 = iio_device_find_channel(adc, "voltage0", false);
297298
ch1 = iio_device_find_channel(adc, "voltage1", false);
298299

299-
if (iio_channel_attr_read_longlong(ch0, "sampling_frequency", &val) == 0)
300+
if (chn_attr_read_longlong(ch0, "sampling_frequency", &val) == 0)
300301
snprintf(attr_val, sizeof(attr_val), "%.3f", (double)val / 1000000.0);
301302
else
302303
snprintf(attr_val, sizeof(attr_val), "%s", "error");
@@ -314,7 +315,7 @@ static GtkWidget * daq2_init(struct osc_plugin *plugin, GtkWidget *notebook, con
314315
/* Tx Widgets */
315316
ch0 = iio_device_find_channel(dac, "altvoltage0", true);
316317

317-
if (iio_channel_attr_read_longlong(ch0, "sampling_frequency", &val) == 0) {
318+
if (chn_attr_read_longlong(ch0, "sampling_frequency", &val) == 0) {
318319
tx_sampling_freq = (double)val / 1000000.0;
319320
snprintf(attr_val, sizeof(attr_val), "%.3f", tx_sampling_freq);
320321
} else {

0 commit comments

Comments
 (0)