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

Jump to bottom

adrv9002 ensm improv #504

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

adrv9002 ensm improv #504

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
a77946e
plugins: adrv9002: fix updating ensm in pin mode
nunojsa Aug 7, 2024
7a5614b
plugins: adrv9002: only read RSSI if RF is enabled
nunojsa Sep 11, 2024
b97790f
iio_widget: fix iio_widget_update_value() arg name
nunojsa Aug 12, 2024
9f0cb47
plugins: adrv9002: improve init on port_en_mode
nunojsa Sep 11, 2024
5236df1
plugins: adrv9002: allow control RF state in pin mode
nunojsa Aug 12, 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
4 changes: 2 additions & 2 deletions iio_widget.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,14 +495,14 @@ static gboolean iio_widget_signal_unblock(gpointer arg)
return FALSE;
}

void iio_widget_update_value(struct iio_widget *widget, const char *ensm, size_t len)
void iio_widget_update_value(struct iio_widget *widget, const char *attr_name, size_t len)
{
guint sig = 0;

if (widget->sig_handler_data)
sig = g_signal_handlers_block_matched(G_OBJECT(widget->widget), G_SIGNAL_MATCH_DATA,
0, 0, NULL, NULL, widget->sig_handler_data);
widget->update_value(widget, ensm, len);
widget->update_value(widget, attr_name, len);

if (sig)
g_timeout_add(1, (GSourceFunc)iio_widget_signal_unblock, widget);
Expand Down
106 changes: 97 additions & 9 deletions plugins/adrv9002.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ struct adrv9002_common {
struct iio_widget w[NUM_MAX_WIDGETS];
uint16_t num_widgets;
bool enabled;
bool enable_gpio;
uint8_t idx;
};

Expand Down Expand Up @@ -499,24 +500,46 @@ static void save_orx_powerdown(GtkWidget *widget, struct adrv9002_orx *orx)
g_free(t_ensm);
}

static void save_ensm(GtkWidget *w, struct iio_widget *widget)
static void save_ensm(GtkWidget *w, struct adrv9002_common *chann)
{
widget->save(widget);
gchar *ensm = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(chann->ensm.widget));
gchar *port_en = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(chann->port_en.widget));

if (!strcmp(port_en, "pin") && !strcmp(ensm, "calibrated")) {
dialog_box_message_error(chann->ensm.widget, "Enable State Mode",
"Only primed or rf_enabled possible when pin mode is enabled");
goto out_free;
}

chann->ensm.save(&chann->ensm);
/*
* If it is a transition to rf_enabled, it can take some time and so, we
* can still get the old value if we do not wait a bit...
*/
usleep(2000);
iio_widget_update_block_signals_by_data(widget);

out_free:
iio_widget_update_block_signals_by_data(&chann->ensm);
g_free(ensm);
g_free(port_en);
}

static void save_port_en(GtkWidget *widget, struct adrv9002_common *chann)
{
char *port_en;

iio_widget_save_block_signals_by_data(&chann->port_en);
port_en = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(widget));
if (chann->enable_gpio) {
/*
* If we can contro RF state when in pin mode, there's no need to
* control the sensitivity. Hence, just update the RF state widget (as
* it can change when moving from pin to spi and vice versa) and bail out.
*/
iio_widget_update_block_signals_by_data(&chann->ensm);
return;
}

port_en = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(widget));
if (port_en && strcmp(port_en, "spi")) {
gtk_widget_set_sensitive(chann->ensm.widget, false);
} else {
Expand Down Expand Up @@ -653,8 +676,12 @@ static void update_special_widgets(struct adrv9002_common *chann, const char *en
if (gain_ctl && strcmp(gain_ctl, "spi"))
iio_widget_update_block_signals_by_data(&chann->gain);

if (port_en && strcmp(port_en, "spi") && ensm)
iio_widget_update_value(&chann->ensm, ensm, len);
if (port_en && strcmp(port_en, "spi") && !chann->enable_gpio) {
if (ensm)
iio_widget_update_value(&chann->ensm, ensm, len);
else
iio_widget_update_block_signals_by_data(&chann->ensm);
}

g_free(gain_ctl);
g_free(port_en);
Expand Down Expand Up @@ -766,6 +793,7 @@ static void adrv9002_update_orx_widgets(struct plugin_private *priv, const int c
static void adrv9002_update_rx_widgets(struct plugin_private *priv, const int chann)
{
struct adrv9002_rx *rx = &priv->rx_widgets[chann];
gchar *ensm;

/* rx */
if (!rx->rx.enabled)
Expand All @@ -782,7 +810,9 @@ static void adrv9002_update_rx_widgets(struct plugin_private *priv, const int ch
/* generic widgets */
iio_update_widgets_block_signals_by_data(rx->rx.w, rx->rx.num_widgets);
/* labels */
update_label(&rx->rssi);
ensm = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(&rx->rx.ensm.widget));
if (ensm && !strcmp(ensm, "rf_enabled"))
update_label(&rx->rssi);
update_label(&rx->decimated_power);
update_label(&rx->rx.rf_bandwidth);
update_label(&rx->rx.sampling_rate);
Expand Down Expand Up @@ -2770,7 +2800,7 @@ static void connect_special_signal_widgets(struct plugin_private *priv, const in
&priv->rx_widgets[chann].rx.nco_freq);
/* ensm mode and port en */
iio_make_widget_update_signal_based(&priv->rx_widgets[chann].rx.ensm,
G_CALLBACK(save_ensm), &priv->rx_widgets[chann].rx.ensm);
G_CALLBACK(save_ensm), &priv->rx_widgets[chann].rx);
iio_make_widget_update_signal_based(&priv->rx_widgets[chann].rx.port_en,
G_CALLBACK(save_port_en), &priv->rx_widgets[chann].rx);
/* digital gain control */
Expand Down Expand Up @@ -2798,7 +2828,7 @@ static void connect_special_signal_widgets(struct plugin_private *priv, const in
&priv->tx_widgets[chann].gain);
/* ensm mode and port en */
iio_make_widget_update_signal_based(&priv->tx_widgets[chann].ensm,
G_CALLBACK(save_ensm), &priv->tx_widgets[chann].ensm);
G_CALLBACK(save_ensm), &priv->tx_widgets[chann]);
iio_make_widget_update_signal_based(&priv->tx_widgets[chann].port_en,
G_CALLBACK(save_port_en), &priv->tx_widgets[chann]);
/* carrier frequency */
Expand Down Expand Up @@ -2922,6 +2952,62 @@ static int adrv9002_dds_init(struct plugin_private *priv)
return ret;
}

static void adrv9002_update_port_en_mode(const struct plugin_private *priv, struct adrv9002_common *chan)
{
gchar *port_en = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(chan->port_en.widget));
char pin_ensm[32];
int ret;

if (!port_en)
return;
if (!strcmp(port_en, "pin")) {
gtk_widget_set_sensitive(chan->ensm.widget, false);
} else {
/*
* Let's check if we can control the RF enable state mode even in pin mode. For
* that, we check which mode we're and if not in pin mode, we move to that mode
* and try to change the state. If we succeed, then it means the driver is
* in full control of the pin controlling the RF state.
*/
ret = iio_channel_attr_write(chan->port_en.chn, "port_en_mode", "pin");
if (ret < 0) {
printf("Could not set port to to pin (%d)\n", ret);
goto out;
}
}

ret = iio_channel_attr_read(chan->ensm.chn, "ensm_mode", pin_ensm, sizeof(pin_ensm));
if (ret < 0)
goto out;

/*
* If we get an error just assume we can't control the state and try to bring the device
* to the initial state.
*/
ret = iio_channel_attr_write(chan->ensm.chn, "ensm_mode", "primed");
if (ret > 0)
chan->enable_gpio = true;

/*
* Go back to the previous state and to spi mode if that was the port mode
* Not much to do in case of error, hence ignore them...
*/
if (chan->enable_gpio) {
iio_channel_attr_write(chan->ensm.chn, "ensm_mode", pin_ensm);
if (!strcmp(port_en, "pin"))
gtk_widget_set_sensitive(chan->ensm.widget, true);
}
/*
* If spi mode had a different ensm state than pin, it will automatically move to
* that state after changing port modes.
*/
if (strcmp(port_en, "pin"))
iio_channel_attr_write(chan->port_en.chn, "port_en_mode", "spi");

out:
g_free(port_en);
}

static void adrv9002_api_version_report(struct plugin_private *priv)
{
GtkWidget *api_frame = GTK_WIDGET(gtk_builder_get_object(priv->builder, "frame_api"));
Expand Down Expand Up @@ -3159,8 +3245,10 @@ static GtkWidget *adrv9002_init(struct osc_plugin *plugin, GtkWidget *notebook,
for (i = 0; i < ADRV9002_NUM_CHANNELS; i++) {
connect_special_signal_widgets(priv, i);
adrv9002_update_rx_widgets(priv, i);
adrv9002_update_port_en_mode(priv, &priv->rx_widgets[i].rx);
adrv9002_update_orx_widgets(priv, i);
adrv9002_update_tx_widgets(priv, i);
adrv9002_update_port_en_mode(priv, &priv->tx_widgets[i]);
iio_make_widgets_update_signal_based(priv->rx_widgets[i].rx.w,
priv->rx_widgets[i].rx.num_widgets,
G_CALLBACK(iio_widget_save_block_signals_by_data_cb));
Expand Down
Loading