[Gpredict-svn] SF.net SVN: gpredict: [27] trunk
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
Menu
▾
▴
[Gpredict-svn] SF.net SVN: gpredict: [27] trunk
|
From: <cs...@us...> - 2008-03-27 12:50:05
|
Revision: 27
http://gpredict.svn.sourceforge.net/gpredict/?rev=27&view=rev
Author: csete
Date: 2008-03-27 05:45:46 -0700 (Thu, 27 Mar 2008)
Log Message:
-----------
Added controls for enabling extended CAT commands (i.e. commands that are not supported by hamlib).
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/radio-conf.c
trunk/src/radio-conf.h
trunk/src/sat-pref-rig-data.h
trunk/src/sat-pref-rig-editor.c
trunk/src/sat-pref-rig.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-03-18 00:25:51 UTC (rev 26)
+++ trunk/ChangeLog 2008-03-27 12:45:46 UTC (rev 27)
@@ -1,5 +1,23 @@
-2008-01-26; Alexandur Csete <oz...@gm...>
+2008-03-27; Alexandru Csete <oz...@gm...>
+ * src/radio-conf.[ch]:
+ Added parameter for enabling built-in radio extensions.
+
+ * src/sat-pref-rig.c:
+ * src/sat-pref-rig-editor.c:
+ * src/sat-pref-rig-data.h:
+ Added configuration controls for CAT extensions
+
+
+2008-03-17; Alexandru Csete <oz...@gm...>
+
+ * src/sat-pref-rig.c:
+ Fixed bug that caused incorrect display of DTR and RTS line settings in
+ the radio list.
+
+
+2008-01-26; Alexandru Csete <oz...@gm...>
+
* src/rotor-conf.[ch]:
* src/sat-pref-rot.c:
* src/sat-pref-rot-editor.c
Modified: trunk/src/radio-conf.c
===================================================================
--- trunk/src/radio-conf.c 2008-03-18 00:25:51 UTC (rev 26)
+++ trunk/src/radio-conf.c 2008-03-27 12:45:46 UTC (rev 27)
@@ -41,6 +41,7 @@
#define KEY_PORT "Port"
#define KEY_SPEED "Speed"
#define KEY_CIV "CIV"
+#define KEY_EXT "EXT"
#define KEY_DTR "DTR"
#define KEY_RTS "RTS"
@@ -91,6 +92,7 @@
conf->port = g_key_file_get_string (cfg, GROUP, KEY_PORT, NULL);
conf->speed = g_key_file_get_integer (cfg, GROUP, KEY_SPEED, NULL);
conf->civ = g_key_file_get_integer (cfg, GROUP, KEY_CIV, NULL);
+ conf->ext = g_key_file_get_boolean (cfg, GROUP, KEY_EXT, NULL);
conf->dtr = g_key_file_get_integer (cfg, GROUP, KEY_DTR, NULL);
conf->rts = g_key_file_get_integer (cfg, GROUP, KEY_RTS, NULL);
@@ -127,6 +129,7 @@
g_key_file_set_string (cfg, GROUP, KEY_PORT, conf->port);
g_key_file_set_integer (cfg, GROUP, KEY_SPEED, conf->speed);
g_key_file_set_integer (cfg, GROUP, KEY_CIV, conf->civ);
+ g_key_file_set_boolean (cfg, GROUP, KEY_EXT, conf->ext);
g_key_file_set_integer (cfg, GROUP, KEY_DTR, conf->dtr);
g_key_file_set_integer (cfg, GROUP, KEY_RTS, conf->rts);
Modified: trunk/src/radio-conf.h
===================================================================
--- trunk/src/radio-conf.h 2008-03-18 00:25:51 UTC (rev 26)
+++ trunk/src/radio-conf.h 2008-03-27 12:45:46 UTC (rev 27)
@@ -61,6 +61,7 @@
gchar *port; /*!< Device name, e.g. /dev/ttyS0. */
guint speed; /*!< Serial speed. */
guint civ; /*!< ICOM CI-V address. */
+ gboolean ext; /*!< Use built in extensions if available. */
ctrl_stat_t dtr; /*!< DTR line usage. */
ctrl_stat_t rts; /*!< PTT line usage. */
} radio_conf_t;
Modified: trunk/src/sat-pref-rig-data.h
===================================================================
--- trunk/src/sat-pref-rig-data.h 2008-03-18 00:25:51 UTC (rev 26)
+++ trunk/src/sat-pref-rig-data.h 2008-03-27 12:45:46 UTC (rev 27)
@@ -37,6 +37,7 @@
RIG_LIST_COL_PORT, /*!< Port / Device, e.g. /dev/ttyS0. */
RIG_LIST_COL_SPEED, /*!< Serial speed. */
RIG_LIST_COL_CIV, /*!< CI-V address for Icom rigs. */
+ RIG_LIST_COL_EXT, /*!< Use built-in extensions. */
RIG_LIST_COL_DTR, /*!< DTR line usage */
RIG_LIST_COL_RTS, /*!< RTS line usage */
RIG_LIST_COL_NUM /*!< The number of fields in the list. */
Modified: trunk/src/sat-pref-rig-editor.c
===================================================================
--- trunk/src/sat-pref-rig-editor.c 2008-03-18 00:25:51 UTC (rev 26)
+++ trunk/src/sat-pref-rig-editor.c 2008-03-27 12:45:46 UTC (rev 27)
@@ -56,6 +56,7 @@
static GtkWidget *name; /* Configuration name */
static GtkWidget *model; /* radio model, e.g. TS-2000 */
static GtkWidget *civ; /* Icom CI-V address */
+static GtkWidget *ext; /* Built-in extensions */
static GtkWidget *type; /* radio type */
static GtkWidget *port; /* port selector */
static GtkWidget *speed; /* serial speed selector */
@@ -240,6 +241,16 @@
_("Select radio type. Consult the user manual, if unsure"));
gtk_table_attach_defaults (GTK_TABLE (table), type, 1, 2, 2, 3);
+
+ /* Enable built-in extensions */
+ ext = gtk_check_button_new_with_label (_("Extended CAT"));
+ gtk_widget_set_tooltip_text (ext,
+ _("Enable built-in gpredict CAT extensions if they are "\
+ "available. This allows the use of commands that are "\
+ "not supported by hamlib, but are necessary for full "\
+ "duplex operation with IC-910, FT-847, etc."));
+ gtk_table_attach_defaults (GTK_TABLE (table), ext, 3, 5, 2, 3);
+
/* Port */
label = gtk_label_new (_("Port"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -377,6 +388,9 @@
/* CI-V */
gtk_combo_box_set_active (GTK_COMBO_BOX (civ), conf->civ);
+ /* Extension */
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ext), conf->ext);
+
/* DTR and RTS lines */
gtk_combo_box_set_active (GTK_COMBO_BOX (dtr), conf->dtr);
gtk_combo_box_set_active (GTK_COMBO_BOX (rts), conf->rts);
@@ -398,6 +412,7 @@
gtk_combo_box_set_active (GTK_COMBO_BOX (port), 0);
gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 4);
gtk_combo_box_set_active (GTK_COMBO_BOX (civ), 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ext), FALSE);
gtk_combo_box_set_active (GTK_COMBO_BOX (dtr), 0);
gtk_combo_box_set_active (GTK_COMBO_BOX (rts), 0);
}
@@ -455,6 +470,9 @@
/* CI-V */
conf->civ = gtk_combo_box_get_active (GTK_COMBO_BOX (civ));
+ /* Extensions */
+ conf->ext = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ext));
+
/* serial speed */
switch (gtk_combo_box_get_active (GTK_COMBO_BOX (speed))) {
case 0:
Modified: trunk/src/sat-pref-rig.c
===================================================================
--- trunk/src/sat-pref-rig.c 2008-03-18 00:25:51 UTC (rev 26)
+++ trunk/src/sat-pref-rig.c 2008-03-27 12:45:46 UTC (rev 27)
@@ -114,6 +114,7 @@
riglist = gtk_tree_view_new ();
+ gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (riglist), TRUE);
model = create_and_fill_model ();
gtk_tree_view_set_model (GTK_TREE_VIEW (riglist), model);
@@ -173,6 +174,14 @@
NULL);
gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
+ /* Extensions */
+ renderer = gtk_cell_renderer_toggle_new ();
+ column = gtk_tree_view_column_new_with_attributes (_("Ext"), renderer,
+ "active", RIG_LIST_COL_EXT,
+ NULL);
+
+ gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
+
/* DTR */
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("DTR Line"), renderer,
@@ -220,6 +229,7 @@
G_TYPE_STRING, // port
G_TYPE_INT, // speed
G_TYPE_INT, // Icom CI-V
+ G_TYPE_BOOLEAN, // Extensions
G_TYPE_INT, // DTR line
G_TYPE_INT // RTS line
);
@@ -251,6 +261,7 @@
RIG_LIST_COL_PORT, conf.port,
RIG_LIST_COL_SPEED, conf.speed,
RIG_LIST_COL_CIV, conf.civ,
+ RIG_LIST_COL_EXT, conf.ext,
RIG_LIST_COL_DTR, conf.dtr,
RIG_LIST_COL_RTS, conf.rts,
-1);
@@ -367,6 +378,7 @@
.port = NULL,
.speed = 0,
.civ = 0,
+ .ext = FALSE,
.dtr = LINE_UNDEF,
.rts = LINE_UNDEF,
};
@@ -412,6 +424,7 @@
RIG_LIST_COL_PORT, &conf.port,
RIG_LIST_COL_SPEED, &conf.speed,
RIG_LIST_COL_CIV, &conf.civ,
+ RIG_LIST_COL_EXT, &conf.ext,
RIG_LIST_COL_DTR, &conf.dtr,
RIG_LIST_COL_RTS, &conf.rts,
-1);
@@ -457,6 +470,7 @@
.port = NULL,
.speed = 0,
.civ = 0,
+ .ext = FALSE,
.dtr = LINE_UNDEF,
.rts = LINE_UNDEF,
};
@@ -476,6 +490,7 @@
RIG_LIST_COL_PORT, conf.port,
RIG_LIST_COL_SPEED, conf.speed,
RIG_LIST_COL_CIV, conf.civ,
+ RIG_LIST_COL_EXT, conf.ext,
RIG_LIST_COL_DTR, conf.dtr,
RIG_LIST_COL_RTS, conf.rts,
-1);
@@ -513,6 +528,7 @@
.port = NULL,
.speed = 0,
.civ = 0,
+ .ext = FALSE,
.dtr = LINE_UNDEF,
.rts = LINE_UNDEF,
};
@@ -543,6 +559,7 @@
RIG_LIST_COL_PORT, &conf.port,
RIG_LIST_COL_SPEED, &conf.speed,
RIG_LIST_COL_CIV, &conf.civ,
+ RIG_LIST_COL_EXT, &conf.ext,
RIG_LIST_COL_DTR, &conf.dtr,
RIG_LIST_COL_RTS, &conf.rts,
-1);
@@ -576,6 +593,7 @@
RIG_LIST_COL_PORT, conf.port,
RIG_LIST_COL_SPEED, conf.speed,
RIG_LIST_COL_CIV, conf.civ,
+ RIG_LIST_COL_EXT, conf.ext,
RIG_LIST_COL_DTR, conf.dtr,
RIG_LIST_COL_RTS, conf.rts,
-1);
@@ -703,6 +721,7 @@
g_free (buff);
}
+
/** \brief Render DTR or RTS columns address.
* \param col Pointer to the tree view column.
* \param renderer Pointer to the renderer.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
