#include <arpa/inet.h>
#include "discovered.h"
-#include "discovery.h"
#include "old_discovery.h"
#include "new_discovery.h"
#include "main.h"
static GtkWidget *apps_combobox[MAX_DEVICES];
#endif
+GtkWidget *tcpaddr;
+#define IPADDR_LEN 20
+static char ipaddr_tcp_buf[IPADDR_LEN] = "10.10.10.10";
+char *ipaddr_tcp = &ipaddr_tcp_buf[0];
+
static gboolean start_cb (GtkWidget *widget, GdkEventButton *event, gpointer data) {
fprintf(stderr,"start_cb: %p\n",data);
radio=(DISCOVERED *)data;
// We have started the SDR app on the RedPitaya, but may need to fill
// in information necessary for starting the radio, including the
// MAC address and the interface listening to. Even when using AVAHI,
- // we miss some information (can_tcp, METIS vs. HERMES, etc).
+ // we miss some information.
// To get all required info, we do a "fake" discovery on the RedPitaya IP address.
// Here we also try TCP if UDP does not work, such that we can work with STEMlabs
// in remote subnets.
return TRUE;
}
+static gboolean tcp_cb (GtkWidget *widget, GdkEventButton *event, gpointer data) {
+ strncpy(ipaddr_tcp, gtk_entry_get_text(GTK_ENTRY(tcpaddr)), IPADDR_LEN);
+ ipaddr_tcp[IPADDR_LEN-1]=0;
+ // remove possible trailing newline chars in ipaddr_tcp
+ int len=strnlen(ipaddr_tcp,IPADDR_LEN);
+ while (--len >= 0) {
+ if (ipaddr_tcp[len] != '\n') break;
+ ipaddr_tcp[len]=0;
+ }
+ fprintf(stderr,"New TCP addr = %s.\n", ipaddr_tcp);
+ // save this value to config file
+ FILE *fp = fopen("ip.addr", "w");
+ if (fp) {
+ fprintf(fp,"%s\n",ipaddr_tcp);
+ fclose(fp);
+ }
+ gtk_widget_destroy(discovery_dialog);
+ g_idle_add(ext_discovery,NULL);
+ return TRUE;
+ }
+
void discovery() {
fprintf(stderr,"discovery\n");
selected_device=0;
devices=0;
+ // Try to locate IP addr
+ FILE *fp=fopen("ip.addr","r");
+ if (fp) {
+ fgets(ipaddr_tcp, IPADDR_LEN,fp);
+ fclose(fp);
+ ipaddr_tcp[IPADDR_LEN-1]=0;
+ // remove possible trailing newline char in ipaddr_tcp
+ int len=strnlen(ipaddr_tcp,IPADDR_LEN);
+ while (--len >= 0) {
+ if (ipaddr_tcp[len] != '\n') break;
+ ipaddr_tcp[len]=0;
+ }
+ }
#ifdef USBOZY
//
// first: look on USB for an Ozy
g_signal_connect (discover_b, "button-press-event", G_CALLBACK(discover_cb), NULL);
gtk_grid_attach(GTK_GRID(grid),discover_b,1,1,1,1);
+ GtkWidget *tcp_b=gtk_button_new_with_label("Try TCP Addr:");
+ g_signal_connect (tcp_b, "button-press-event", G_CALLBACK(tcp_cb), NULL);
+ gtk_grid_attach(GTK_GRID(grid),tcp_b,0,2,1,1);
+
+ tcpaddr=gtk_entry_new();
+ gtk_entry_set_max_length(GTK_ENTRY(tcpaddr), 20);
+ gtk_grid_attach(GTK_GRID(grid),tcpaddr,1,2,1,1);
+ gtk_entry_set_text(GTK_ENTRY(tcpaddr), ipaddr_tcp);
+
gtk_container_add (GTK_CONTAINER (content), grid);
gtk_widget_show_all(discovery_dialog);
} else {
g_signal_connect (exit_b, "button-press-event", G_CALLBACK(exit_cb), NULL);
gtk_grid_attach(GTK_GRID(grid),exit_b,2,i,1,1);
+ i++;
+ GtkWidget *tcp_b=gtk_button_new_with_label("Try TCP Addr:");
+ g_signal_connect (tcp_b, "button-press-event", G_CALLBACK(tcp_cb), NULL);
+ gtk_grid_attach(GTK_GRID(grid),tcp_b,1,i,1,1);
+
+ tcpaddr=gtk_entry_new();
+ gtk_entry_set_max_length(GTK_ENTRY(tcpaddr), 20);
+ gtk_grid_attach(GTK_GRID(grid),tcpaddr,2,i,1,1);
+ gtk_entry_set_text(GTK_ENTRY(tcpaddr), ipaddr_tcp);
+
gtk_container_add (GTK_CONTAINER (content), grid);
gtk_widget_show_all(discovery_dialog);
fprintf(stderr,"showing device dialog\n");
#include <wdsp.h>
#include "button_text.h"
-//#include "led.h"
#include "new_menu.h"
#include "radio.h"
#include "toolbar.h"
static GtkWidget *correcting_l;
static GtkWidget *get_pk;
static GtkWidget *set_pk;
+static GtkWidget *tx_att;
+
+/*
+ * PureSignal 2.0 default parameters and declarations
+ */
+
+static double ampdelay = 20e-9; // 20 nsec
+static int ints = 16;
+static int spi = 256;
+static int stbl = 0;
+static int map = 1;
+static int pin = 1;
+static double ptol = 0.8;
+static double moxdelay = 0.1;
+static double loopdelay = 0.0;
+
+//
+// The following declarations are missing in wdsp.h
+// We put them here because sooner or later there will be
+// a corrected version of WDSP where this is contained
+//
+extern void SetPSIntsAndSpi (int channel, int ints, int spi);
+extern void SetPSStabilize (int channel, int stbl);
+extern void SetPSMapMode (int channel, int map);
+extern void SetPSPinMode (int channel, int pin);
+
+//
+// Todo: create buttons to change these value
+//
+
static int running=0;
static GtkWidget *entry[INFO_SIZE];
-// results from GetPSDisp
-static double ps_x[4096];
-static double ps_ym[4096];
-static double ps_yc[4096];
-static double ps_ys[4096];
-static double ps_cm[64];
-static double ps_cc[64];
-static double ps_cs[64];
-
static void destroy_cb(GtkWidget *widget, gpointer data) {
-//fprintf(stderr,"ps_menu: destroy_cb\n");
running=0;
+ // wait for one instance of info_thread to complete
+ usleep(100000);
}
static void cleanup() {
+ running=0;
+ // wait for one instance of info_thread to complete
+ usleep(100000);
+
if(transmitter->twotone) {
tx_set_twotone(transmitter,0);
}
return FALSE;
}
-static int deltadb=0;
-
//
//
// DL1YCF: had repeated seg-faults, possibly this is not thread-safe.
// prepeared in "label".
//
static int info_thread(gpointer arg) {
- static int info[16];
+ static int info[INFO_SIZE];
int i;
gchar label[20];
static int old5=0;
static int old5_2=0;
static int old14=0;
int display;
- int state=0;
- int save_auto_on;
- int save_single_on;
+ static int state=0;
- if(transmitter->auto_on) {
- transmitter->attenuation=31;
- } else {
- transmitter->attenuation=0;
- }
+ if (!running) return FALSE;
GetPSInfo(transmitter->id,&info[0]);
for(i=0;i<INFO_SIZE;i++) {
if(info[i]!=old5) {
old5=info[5];
if(info[4]>181) {
- gtk_label_set_markup(GTK_LABEL(feedback_l),"<span color='black'>Feedback Lvl</span>");
+ gtk_label_set_markup(GTK_LABEL(feedback_l),"<span color='blue'>Feedback Lvl</span>");
} else if(info[4]>128) {
gtk_label_set_markup(GTK_LABEL(feedback_l),"<span color='green'>Feedback Lvl</span>");
} else if(info[4]>90) {
}
}
+ sprintf(label,"%d",transmitter->attenuation);
+ gtk_entry_set_text(GTK_ENTRY(tx_att),label);
+
double pk;
GetPSMaxTX(transmitter->id,&pk);
- sprintf(label,"%f", pk);
+ sprintf(label,"%6.3f", pk);
gtk_entry_set_text(GTK_ENTRY(get_pk),label);
if (transmitter->auto_on) {
double ddb;
+ int new_att;
int newcal=info[5]!=old5_2;
old5_2=info[5];
switch(state) {
case 0:
if(newcal && (info[4]>181 || (info[4]<=128 && transmitter->attenuation>0))) {
- if(info[4]<=256) {
- ddb= 20.0 * log10((double)info[4]/152.293);
- if(isnan(ddb)) {
- ddb=31.1;
- }
- if(ddb<-100.0) {
+ ddb= 20.0 * log10((double)info[4]/152.293);
+ if(isnan(ddb)) {
+ // this means feedback lvl is < 1, switch OFF attenuation
ddb=-100.0;
- }
- if(ddb > 100.0) {
- ddb=100.0;
- }
- } else {
- ddb=31.1;
}
- deltadb=(int)ddb;
- save_auto_on=transmitter->auto_on;
- save_single_on=transmitter->single_on;
- SetPSControl(transmitter->id, 1, 0, 0, 0);
- state=1;
+ new_att=transmitter->attenuation + (int)ddb;
+ // keep new value of attenuation in allowed range
+ if (new_att < 0) new_att= 0;
+ if (new_att > 31) new_att=31;
+ // A "PS reset" is only necessary if the attenuation
+ // has actually changed. This prevents firing "reset"
+ // constantly if the SDR board does not have a TX attenuator
+ // (in this case, att will fast reach 31 and stay there if the
+ // feedback level is too high).
+ // Actually, we first adjust the attenuation (state=0),
+ // then do a PS reset (state=1), and then restart PS (state=2).
+ if (transmitter->attenuation != new_att) {
+ transmitter->attenuation=new_att;
+ state=1;
+ }
}
break;
case 1:
- if((deltadb+transmitter->attenuation)>0) {
- transmitter->attenuation+=deltadb;
- } else {
- transmitter->attenuation=0;
- }
- state=2;
- break;
+ state=2;
+ SetPSControl(transmitter->id, 1, 0, 0, 0);
+ break;
case 2:
state=0;
- SetPSControl(transmitter->id, 0, save_single_on, save_auto_on, 0);
+ SetPSControl(transmitter->id, 0, 0, 1, 0);
break;
}
}
- if (!running) gtk_entry_set_text(GTK_ENTRY(entry[15]),"");
- return running ? TRUE : FALSE;
+ return TRUE;
}
static void enable_cb(GtkWidget *widget, gpointer data) {
}
}
-static void calibrate_cb(GtkWidget *widget, gpointer data) {
- transmitter->puresignal=1;
- SetPSControl(transmitter->id, 0, 1, 0, 0);
+static void resume_cb(GtkWidget *widget, gpointer data) {
+ SetPSControl(transmitter->id, 0, 0, 1, 0);
}
static void feedback_cb(GtkWidget *widget, gpointer data) {
} else {
set_button_text_color(widget,"black");
}
- if(state && transmitter->puresignal) {
- running=1;
- g_timeout_add((guint) 100, info_thread, NULL);
- } else {
- running=0;
- }
}
void ps_menu(GtkWidget *parent) {
col++;
- GtkWidget *reset_b=gtk_button_new_with_label("Reset");
+ GtkWidget *reset_b=gtk_button_new_with_label("OFF");
gtk_widget_show(reset_b);
gtk_grid_attach(GTK_GRID(grid),reset_b,col,row,1,1);
g_signal_connect(reset_b,"pressed",G_CALLBACK(reset_cb),NULL);
col++;
+ GtkWidget *resume_b=gtk_button_new_with_label("Restart");
+ gtk_grid_attach(GTK_GRID(grid),resume_b,col,row,1,1);
+ g_signal_connect(resume_b,"pressed",G_CALLBACK(resume_cb),NULL);
+
+ col++;
+
GtkWidget *feedback_b=gtk_button_new_with_label("MON");
gtk_widget_show(feedback_b);
gtk_grid_attach(GTK_GRID(grid),feedback_b,col,row,1,1);
set_button_text_color(feedback_b,"red");
}
-
row++;
col=0;
int display=1;
char label[16];
switch(i) {
- //case 0:
- // strcpy(label,"bldr.rx");
- // break;
- //case 1:
- // strcpy(label,"bldr.cm");
- // break;
- //case 2:
- // strcpy(label,"bldr.cc");
- // break;
- //case 3:
- // strcpy(label,"bldr.cs");
- // break;
case 4:
strcpy(label,"feedbk");
break;
break;
default:
display=0;
- sprintf(label,"Info %d:", i);
break;
}
if(display) {
GtkWidget *lbl=gtk_label_new(label);
entry[i]=gtk_entry_new();
- gtk_entry_set_max_length(GTK_ENTRY(entry[i]), 20);
+ gtk_entry_set_max_length(GTK_ENTRY(entry[i]), 10);
gtk_grid_attach(GTK_GRID(grid),lbl,col,row,1,1);
col++;
gtk_grid_attach(GTK_GRID(grid),entry[i],col,row,1,1);
+ gtk_entry_set_width_chars(GTK_ENTRY(entry[i]), 10);
col++;
if(col>=6) {
row++;
get_pk=gtk_entry_new();
gtk_grid_attach(GTK_GRID(grid),get_pk,col,row,1,1);
+ gtk_entry_set_width_chars(GTK_ENTRY(get_pk), 10);
col++;
lbl=gtk_label_new("SetPk");
double pk;
char pk_text[16];
GetPSHWPeak(transmitter->id,&pk);
- sprintf(pk_text,"%f",pk);
+ sprintf(pk_text,"%6.3f",pk);
set_pk=gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(set_pk),pk_text);
gtk_grid_attach(GTK_GRID(grid),set_pk,col,row,1,1);
+ gtk_entry_set_width_chars(GTK_ENTRY(set_pk), 10);
+ col++;
+
+ lbl=gtk_label_new("TX ATT");
+ gtk_grid_attach(GTK_GRID(grid),lbl,col,row,1,1);
+ col++;
+
+ tx_att=gtk_entry_new();
+ gtk_grid_attach(GTK_GRID(grid),tx_att,col,row,1,1);
+ gtk_entry_set_width_chars(GTK_ENTRY(tx_att), 10);
gtk_container_add(GTK_CONTAINER(content),grid);
sub_menu=dialog;
- //if(transmitter->puresignal) {
- // info_thread_id=g_thread_new( "PS info", info_thread, NULL);
- //}
+// DL1YCF: This is not the default setting,
+// but in my experience in behaves better in difficult situations.
+ ints=8;
+ spi=512;
+ ampdelay=100e-9;
+
+ SetPSIntsAndSpi(transmitter->id, ints, spi);
+ SetPSStabilize(transmitter->id, stbl);
+ SetPSMapMode(transmitter->id, map);
+ SetPSPinMode(transmitter->id, pin);
+ SetPSPtol(transmitter->id, ptol);
+ SetPSMoxDelay(transmitter->id, moxdelay);
+ SetPSTXDelay(transmitter->id, ampdelay);
+ SetPSLoopDelay(transmitter->id, loopdelay);
+
+ running=1;
+ g_timeout_add((guint) 100, info_thread, NULL);
gtk_widget_show_all(dialog);
projects / pihpsdr.git / commitdiff