gpredict-svn Mailing List for Gpredict (Page 34)
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
Menu
▾
▴
gpredict-svn — Subversion commit archive for Gpredict.
You can subscribe to this list here.
| 2008 |
Jan
(24) |
Feb
|
Mar
(6) |
Apr
(14) |
May
(9) |
Jun
|
Jul
|
Aug
(25) |
Sep
(60) |
Oct
(26) |
Nov
|
Dec
(20) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
|
Feb
(2) |
Mar
(22) |
Apr
(61) |
May
(57) |
Jun
|
Jul
(3) |
Aug
(83) |
Sep
(35) |
Oct
(50) |
Nov
(28) |
Dec
(34) |
| 2010 |
Jan
(29) |
Feb
(15) |
Mar
(2) |
Apr
|
May
(6) |
Jun
(2) |
Jul
(24) |
Aug
(2) |
Sep
(9) |
Oct
(43) |
Nov
(22) |
Dec
(6) |
| 2011 |
Jan
(24) |
Feb
(22) |
Mar
(31) |
Apr
(13) |
May
(10) |
Jun
(10) |
Jul
(43) |
Aug
(12) |
Sep
(18) |
Oct
(33) |
Nov
(18) |
Dec
(4) |
|
From: <cs...@us...> - 2008-09-20 23:36:09
|
Revision: 141
http://gpredict.svn.sourceforge.net/gpredict/?rev=141&view=rev
Author: csete
Date: 2008-09-20 23:36:06 +0000 (Sat, 20 Sep 2008)
Log Message:
-----------
Updated for version 1.0 beta 1.
Modified Paths:
--------------
trunk/doc/um/gpredict-user-manual.odt
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-20 13:22:10
|
Revision: 140
http://gpredict.svn.sourceforge.net/gpredict/?rev=140&view=rev
Author: csete
Date: 2008-09-20 13:22:08 +0000 (Sat, 20 Sep 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/um/gpredict-user-manual.odt
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-20 13:21:28 UTC (rev 139)
+++ trunk/ChangeLog 2008-09-20 13:22:08 UTC (rev 140)
@@ -1,3 +1,9 @@
+2008-09-20; Alexandru Csete <oz...@gm...>
+
+ * src/tle-update.c:
+ Changed connection timeout from system default to 10 seconds.
+
+
2008-09-18; Alexandru Csete <oz...@gm...>
* src/gtk-rig-ctrl.[ch]:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-20 13:21:30
|
Revision: 139
http://gpredict.svn.sourceforge.net/gpredict/?rev=139&view=rev
Author: csete
Date: 2008-09-20 13:21:28 +0000 (Sat, 20 Sep 2008)
Log Message:
-----------
Changed connection timeout from system default to 10 seconds.
Modified Paths:
--------------
trunk/src/tle-update.c
Modified: trunk/src/tle-update.c
===================================================================
--- trunk/src/tle-update.c 2008-09-18 19:04:42 UTC (rev 138)
+++ trunk/src/tle-update.c 2008-09-20 13:21:28 UTC (rev 139)
@@ -473,6 +473,7 @@
curl_easy_setopt (curl, CURLOPT_PROXY, proxy);
curl_easy_setopt (curl, CURLOPT_USERAGENT, "gpredict/curl");
+ curl_easy_setopt (curl, CURLOPT_CONNECTTIMEOUT, 10);
/* get files */
for (i = 0; i < numfiles; i++) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-18 12:04:31
|
Revision: 138
http://gpredict.svn.sourceforge.net/gpredict/?rev=138&view=rev
Author: csete
Date: 2008-09-18 19:04:42 +0000 (Thu, 18 Sep 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/um/gpredict-user-manual.odt
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-18 19:04:00 UTC (rev 137)
+++ trunk/ChangeLog 2008-09-18 19:04:42 UTC (rev 138)
@@ -1,5 +1,16 @@
-2008-09-19; Alexandru Csete <oz...@gm...>
+2008-09-18; Alexandru Csete <oz...@gm...>
+ * src/gtk-rig-ctrl.[ch]:
+ Implemented active feedback to take into account frequency changes made
+ via radio dial. Removed newline from the end of hamlib commands.
+ Improved controller algorithm to only set frequency if it has changed.
+
+ * src/gtk-rot-ctrl.c:
+ Removed newline from the end of hamlib commands.
+
+
+2008-09-18; Alexandru Csete <oz...@gm...>
+
* src/rotor-conf.[ch]:
Added field for storing rotator azimuth type, i.e. whether the rotator
azimuth goes 0..360 or -180..+180.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-18 12:03:49
|
Revision: 137
http://gpredict.svn.sourceforge.net/gpredict/?rev=137&view=rev
Author: csete
Date: 2008-09-18 19:04:00 +0000 (Thu, 18 Sep 2008)
Log Message:
-----------
Removed newline from the end of hamlib commands.
Modified Paths:
--------------
trunk/src/gtk-rot-ctrl.c
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2008-09-18 18:52:52 UTC (rev 136)
+++ trunk/src/gtk-rot-ctrl.c 2008-09-18 19:04:00 UTC (rev 137)
@@ -986,14 +986,9 @@
}
/* send command */
- buff = g_strdup_printf ("p\n");
+ buff = g_strdup_printf ("p");
- /* number of bytes to write depends on platform (EOL) */
-#ifdef G_OS_WIN32
- size = 3;
-#else
- size = 2;
-#endif
+ size = 1;
written = send(sock, buff, size, 0);
if (written != size) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
@@ -1102,14 +1097,9 @@
/* send command */
g_ascii_formatd (azstr, 8, "%7.2f", az);
g_ascii_formatd (elstr, 8, "%7.2f", el);
- buff = g_strdup_printf ("P %s %s\n", azstr, elstr);
+ buff = g_strdup_printf ("P %s %s", azstr, elstr);
- /* number of bytes to write depends on platform (EOL) */
-#ifdef G_OS_WIN32
- size = 19;
-#else
- size = 18;
-#endif
+ size = 17;
written = send(sock, buff, size, 0);
if (written != size) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-18 11:52:41
|
Revision: 136
http://gpredict.svn.sourceforge.net/gpredict/?rev=136&view=rev
Author: csete
Date: 2008-09-18 18:52:52 +0000 (Thu, 18 Sep 2008)
Log Message:
-----------
Implemented active feedback to take into account frequency changes made via radio dial. Removed newline from the end of hamlib commands. Improved controller algorithm to only set frequency if it has changed.
Modified Paths:
--------------
trunk/src/gtk-rig-ctrl.c
Modified: trunk/src/gtk-rig-ctrl.c
===================================================================
--- trunk/src/gtk-rig-ctrl.c 2008-09-18 00:17:26 UTC (rev 135)
+++ trunk/src/gtk-rig-ctrl.c 2008-09-18 18:52:52 UTC (rev 136)
@@ -82,6 +82,7 @@
static void rig_locked_cb (GtkToggleButton *button, gpointer data);
static gboolean rig_ctrl_timeout_cb (gpointer data);
static gboolean set_freq (GtkRigCtrl *ctrl, gdouble freq);
+static gboolean get_freq (GtkRigCtrl *ctrl, gdouble *freq);
static void update_count_down (GtkRigCtrl *ctrl, gdouble t);
@@ -744,7 +745,7 @@
rig_ctrl_timeout_cb (gpointer data)
{
GtkRigCtrl *ctrl = GTK_RIG_CTRL (data);
- gdouble satfreq,doppler,lof;
+ gdouble satfreq,doppler,lof,readfreq=0,lastfreq;
if (ctrl->busy) {
@@ -754,6 +755,39 @@
ctrl->busy = TRUE;
+ lof = 1.0e6*gtk_spin_button_get_value (GTK_SPIN_BUTTON (ctrl->LO));
+
+ /* Dial feedback:
+ If radio device is engaged read frequency from radio and compare it to the
+ last set frequency. If different, it means that user has changed frequency
+ on the radio dial => update transponder knob
+ */
+ if ((ctrl->engaged) && (ctrl->conf != NULL)) {
+ lastfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->RigFreq));
+
+ /* get current frequency from rig */
+ if (!get_freq (ctrl, &readfreq)) {
+ /* error => use a passive value */
+ readfreq = lastfreq;
+ }
+
+ if (fabs (readfreq - lastfreq) > 0.99) {
+ /* user might have altered radio frequency => update transponder knob */
+ gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreq), readfreq);
+
+ /* doppler shift; only if we are tracking */
+ if (ctrl->tracking) {
+ satfreq = (readfreq+lof) / (1 - (ctrl->target->range_rate/299792.4580));
+ }
+ else {
+ satfreq = readfreq + lof;
+ }
+ gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->SatFreq), satfreq);
+ }
+ }
+
+ /* now, forward tracking */
+
/* If we are tracking, calculate the radio freq by applying both dopper shift
and tranverter LO frequency.
If we are not tracking, apply only LO frequency.
@@ -761,17 +795,17 @@
if (ctrl->tracking) {
satfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreq));
doppler = -satfreq * (ctrl->target->range_rate / 299792.4580);
- lof = 1.0e6*gtk_spin_button_get_value (GTK_SPIN_BUTTON (ctrl->LO));
- gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreq), satfreq+doppler+lof);
+ gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreq), satfreq+doppler-lof);
}
else {
satfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreq));
- lof = 1.0e6*gtk_spin_button_get_value (GTK_SPIN_BUTTON (ctrl->LO));
- gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreq), satfreq+lof);
+ gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreq), satfreq-lof);
}
+
/* if device is engaged, send freq command to radio */
- if ((ctrl->engaged) && (ctrl->conf != NULL)) {
+ if ((ctrl->engaged) && (ctrl->conf != NULL) &&
+ (fabs (readfreq-gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreq))) > 0.99)) {
if (set_freq (ctrl, gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreq)))) {
/* reset error counter */
ctrl->errcnt = 0;
@@ -857,14 +891,9 @@
}
/* send command */
- buff = g_strdup_printf ("F %10.0f\n", freq);
+ buff = g_strdup_printf ("F %10.0f", freq);
- /* number of bytes to write depends on platform (EOL) */
-#ifdef G_OS_WIN32
- size = 14;
-#else
- size = 13;
-#endif
+ size = 12;
written = send(sock, buff, size, 0);
if (written != size) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
@@ -881,6 +910,114 @@
}
+/** \brief Get frequency
+ * \param ctrl Pointer to the GtkRigCtrl structure.
+ * \param freq The current frequency of the radio.
+ * \return TRUE if the operation was successful, FALSE if a connection error
+ * occurred.
+ */
+static gboolean get_freq (GtkRigCtrl *ctrl, gdouble *freq)
+{
+ gchar *buff,**vbuff;
+ gint written,size;
+ gint status;
+ struct hostent *h;
+ struct sockaddr_in ServAddr;
+ gint sock; /*!< Network socket */
+
+
+ if (freq == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s:%d: NULL storage."),
+ __FILE__, __LINE__);
+ return FALSE;
+ }
+
+ /* create socket */
+ sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+ if (sock < 0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%d: Failed to create socket"),
+ __FILE__, __LINE__);
+ return FALSE;
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s:%d Network socket created successfully"),
+ __FILE__, __LINE__);
+ }
+
+ memset(&ServAddr, 0, sizeof(ServAddr)); /* Zero out structure */
+ ServAddr.sin_family = AF_INET; /* Internet address family */
+ h = gethostbyname(ctrl->conf->host);
+ memcpy((char *) &ServAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
+ ServAddr.sin_port = htons(ctrl->conf->port); /* Server port */
+
+ /* establish connection */
+ status = connect(sock, (struct sockaddr *) &ServAddr, sizeof(ServAddr));
+ if (status < 0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%d: Failed to connect to %s:%d"),
+ __FILE__, __LINE__, ctrl->conf->host, ctrl->conf->port);
+ return FALSE;
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s:%d: Connection opened to %s:%d"),
+ __FILE__, __LINE__, ctrl->conf->host, ctrl->conf->port);
+ }
+
+ /* send command */
+ buff = g_strdup_printf ("f");
+
+ size = 1;
+ written = send(sock, buff, size, 0);
+ if (written != size) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%d: SIZE ERROR %d / %d"),
+ __FILE__, __LINE__, written, size);
+ }
+ g_free (buff);
+
+
+ /* try to read answer */
+ buff = g_try_malloc (128);
+ if (buff == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%s: Failed to allocate 128 bytes (yes, this means trouble)"),
+ __FILE__, __FUNCTION__);
+ shutdown (sock, SHUT_RDWR);
+ close (sock);
+ return FALSE;
+ }
+
+ size = read (sock, buff, 127);
+ if (size == 0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%s: Got 0 bytes from rotctld"),
+ __FILE__, __FUNCTION__);
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s:%s: Read %d bytes from rotctld"),
+ __FILE__, __FUNCTION__, size);
+
+ buff[size] = 0;
+ vbuff = g_strsplit (buff, "\n", 3);
+ *freq = g_strtod (vbuff[0], NULL);
+
+ g_free (buff);
+ g_strfreev (vbuff);
+ }
+
+ shutdown (sock, SHUT_RDWR);
+ close (sock);
+
+
+ return TRUE;
+}
+
+
/** \brief Update count down label.
* \param[in] ctrl Pointer to the RigCtrl widget.
* \param[in] t The current time.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-17 23:23:35
|
Revision: 133
http://gpredict.svn.sourceforge.net/gpredict/?rev=133&view=rev
Author: csete
Date: 2008-09-17 23:23:46 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
Added supprot for azimuth type.
Modified Paths:
--------------
trunk/src/sat-pref-rot-data.h
trunk/src/sat-pref-rot.c
Modified: trunk/src/sat-pref-rot-data.h
===================================================================
--- trunk/src/sat-pref-rot-data.h 2008-09-17 22:39:36 UTC (rev 132)
+++ trunk/src/sat-pref-rot-data.h 2008-09-17 23:23:46 UTC (rev 133)
@@ -37,6 +37,7 @@
ROT_LIST_COL_MAXAZ, /*!< Upper Az limit. */
ROT_LIST_COL_MINEL, /*!< Lower El limit. */
ROT_LIST_COL_MAXEL, /*!< Upper El limit. */
+ ROT_LIST_COL_AZTYPE, /*!< Azimuth type. */
ROT_LIST_COL_NUM /*!< The number of fields in the list. */
} rotor_list_col_t;
Modified: trunk/src/sat-pref-rot.c
===================================================================
--- trunk/src/sat-pref-rot.c 2008-09-17 22:39:36 UTC (rev 132)
+++ trunk/src/sat-pref-rot.c 2008-09-17 23:23:46 UTC (rev 133)
@@ -61,6 +61,12 @@
GtkTreeIter *iter,
gpointer column);
+static void render_aztype (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column);
+
/* global objects */
static GtkWidget *addbutton;
static GtkWidget *editbutton;
@@ -101,6 +107,7 @@
rotlist = gtk_tree_view_new ();
+ gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (rotlist), TRUE);
model = create_and_fill_model ();
gtk_tree_view_set_model (GTK_TREE_VIEW (rotlist), model);
@@ -160,13 +167,24 @@
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("Max El"), renderer,
- "text", ROT_LIST_COL_MAXAZ,
+ "text", ROT_LIST_COL_MAXEL,
NULL);
gtk_tree_view_column_set_cell_data_func (column, renderer,
render_angle,
GUINT_TO_POINTER(ROT_LIST_COL_MAXEL),
NULL);
gtk_tree_view_insert_column (GTK_TREE_VIEW (rotlist), column, -1);
+
+ /* Az type */
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (_("Azimuth Type"), renderer,
+ "text", ROT_LIST_COL_AZTYPE,
+ NULL);
+ gtk_tree_view_column_set_cell_data_func (column, renderer,
+ render_aztype,
+ GUINT_TO_POINTER(ROT_LIST_COL_AZTYPE),
+ NULL);
+ gtk_tree_view_insert_column (GTK_TREE_VIEW (rotlist), column, -1);
}
@@ -191,7 +209,8 @@
G_TYPE_DOUBLE, // Min Az
G_TYPE_DOUBLE, // Max Az
G_TYPE_DOUBLE, // Min El
- G_TYPE_DOUBLE // Max El
+ G_TYPE_DOUBLE, // Max El
+ G_TYPE_INT // Az type
);
/* open configuration directory */
@@ -221,6 +240,7 @@
ROT_LIST_COL_MAXAZ, conf.maxaz,
ROT_LIST_COL_MINEL, conf.minel,
ROT_LIST_COL_MAXEL, conf.maxel,
+ ROT_LIST_COL_AZTYPE, conf.aztype,
-1);
sat_log_log (SAT_LOG_LEVEL_DEBUG,
@@ -332,6 +352,7 @@
.maxaz = 360,
.minel = 0,
.maxel = 90,
+ .aztype = ROT_AZ_TYPE_360,
};
@@ -375,6 +396,7 @@
ROT_LIST_COL_MAXAZ, &conf.maxaz,
ROT_LIST_COL_MINEL, &conf.minel,
ROT_LIST_COL_MAXEL, &conf.maxel,
+ ROT_LIST_COL_AZTYPE, &conf.aztype,
-1);
rotor_conf_save (&conf);
@@ -415,6 +437,7 @@
.maxaz = 360,
.minel = 0,
.maxel = 90,
+ .aztype = ROT_AZ_TYPE_360,
};
/* run rot conf editor */
@@ -432,6 +455,7 @@
ROT_LIST_COL_MAXAZ, conf.maxaz,
ROT_LIST_COL_MINEL, conf.minel,
ROT_LIST_COL_MAXEL, conf.maxel,
+ ROT_LIST_COL_AZTYPE, conf.aztype,
-1);
g_free (conf.name);
@@ -465,6 +489,7 @@
.maxaz = 360,
.minel = 0,
.maxel = 90,
+ .aztype = ROT_AZ_TYPE_360,
};
@@ -493,6 +518,7 @@
ROT_LIST_COL_MAXAZ, &conf.maxaz,
ROT_LIST_COL_MINEL, &conf.minel,
ROT_LIST_COL_MAXEL, &conf.maxel,
+ ROT_LIST_COL_AZTYPE, &conf.aztype,
-1);
}
@@ -524,6 +550,7 @@
ROT_LIST_COL_MAXAZ, conf.maxaz,
ROT_LIST_COL_MINEL, conf.minel,
ROT_LIST_COL_MAXEL, conf.maxel,
+ ROT_LIST_COL_AZTYPE, conf.aztype,
-1);
}
@@ -609,7 +636,44 @@
}
+/** \brief Render the azimuth type.
+ * \param col Pointer to the tree view column.
+ * \param renderer Pointer to the renderer.
+ * \param model Pointer to the tree model.
+ * \param iter Pointer to the tree iterator.
+ * \param column The column number in the model.
+ *
+ */
+static void render_aztype (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column)
+{
+ gint number;
+ guint coli = GPOINTER_TO_UINT (column);
+ gchar *text;
+
+ gtk_tree_model_get (model, iter, coli, &number, -1);
+ switch (number) {
+ case ROT_AZ_TYPE_360:
+ text = g_strdup_printf ("0\302\260 \342\206\222 180\302\260 \342\206\222 360\302\260");
+ break;
+
+ case ROT_AZ_TYPE_180:
+ text = g_strdup_printf ("-180\302\260 \342\206\222 0\302\260 \342\206\222 +180\302\260");
+ break;
+
+ default:
+ text = g_strdup_printf (_("Uknown (%d)"), number);
+ break;
+ }
+
+ g_object_set (renderer, "text", text, NULL);
+ g_free (text);
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-17 22:39:25
|
Revision: 132
http://gpredict.svn.sourceforge.net/gpredict/?rev=132&view=rev
Author: csete
Date: 2008-09-17 22:39:36 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
Added support for Az-type.
Modified Paths:
--------------
trunk/src/sat-pref-rot-editor.c
Modified: trunk/src/sat-pref-rot-editor.c
===================================================================
--- trunk/src/sat-pref-rot-editor.c 2008-09-17 22:07:05 UTC (rev 131)
+++ trunk/src/sat-pref-rot-editor.c 2008-09-17 22:39:36 UTC (rev 132)
@@ -54,6 +54,7 @@
static GtkWidget *name; /* Configuration name */
static GtkWidget *host; /* host name or IP */
static GtkWidget *port; /* port number */
+static GtkWidget *aztype;
static GtkWidget *minaz;
static GtkWidget *maxaz;
static GtkWidget *minel;
@@ -65,6 +66,7 @@
static void clear_widgets (void);
static gboolean apply_changes (rotor_conf_t *conf);
static void name_changed (GtkWidget *widget, gpointer data);
+static void aztype_changed_cb (GtkComboBox *box, gpointer data);
/** \brief Add or edit a rotor configuration.
@@ -143,7 +145,7 @@
GtkWidget *label;
- table = gtk_table_new (5, 4, FALSE);
+ table = gtk_table_new (7, 4, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 5);
gtk_table_set_col_spacings (GTK_TABLE (table), 5);
gtk_table_set_row_spacings (GTK_TABLE (table), 5);
@@ -173,7 +175,8 @@
host = gtk_entry_new ();
gtk_entry_set_max_length (GTK_ENTRY (host), 50);
gtk_widget_set_tooltip_text (host,
- _("Enter the host and port where rogctld is running, e.g. 192.168.1.100:15123"));
+ _("Enter the host where rogctld is running. You can use both host name "\
+ " and IP address."));
gtk_table_attach_defaults (GTK_TABLE (table), host, 1, 4, 1, 2);
/* port */
@@ -185,45 +188,64 @@
gtk_spin_button_set_value (GTK_SPIN_BUTTON (port), 4533);
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (port), 0);
gtk_widget_set_tooltip_text (port,
- _("Enter the port number where rotctld is listening"));
- gtk_table_attach_defaults (GTK_TABLE (table), port, 1, 3, 2, 3);
+ _("Enter the port number where rotctld is listening. Default is 4533."));
+ gtk_table_attach_defaults (GTK_TABLE (table), port, 1, 2, 2, 3);
+ gtk_table_attach_defaults (GTK_TABLE (table), gtk_hseparator_new(), 0, 4, 3, 4);
+
+ /* Az-type */
+ label = gtk_label_new (_("Az type"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 4, 5);
+
+ aztype = gtk_combo_box_new_text ();
+ gtk_combo_box_append_text (GTK_COMBO_BOX (aztype),
+ "0\302\260 \342\206\222 180\302\260 \342\206\222 360\302\260");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (aztype),
+ "-180\302\260 \342\206\222 0\302\260 \342\206\222 +180\302\260");
+ gtk_widget_set_tooltip_text (aztype,
+ _("Select your azimuth range here. Note that gpredict assumes "
+ "that 0\302\260 is at North and + direction is clockwise for "\
+ "both types"));
+ gtk_table_attach_defaults (GTK_TABLE (table), aztype, 1, 3, 4, 5);
+ g_signal_connect (G_OBJECT (aztype), "changed", G_CALLBACK (aztype_changed_cb), NULL);
+
/* Az and El limits */
label = gtk_label_new (_(" Min Az"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
- minaz = gtk_spin_button_new_with_range (-40, 450, 1);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 5, 6);
+ minaz = gtk_spin_button_new_with_range (-200, 100, 1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (minaz), 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (minaz), TRUE);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (minaz), FALSE);
- gtk_table_attach_defaults (GTK_TABLE (table), minaz, 1, 2, 3, 4);
+ gtk_table_attach_defaults (GTK_TABLE (table), minaz, 1, 2, 5, 6);
label = gtk_label_new (_(" Max Az"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 3, 4);
- maxaz = gtk_spin_button_new_with_range (-40, 450, 1);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 5, 6);
+ maxaz = gtk_spin_button_new_with_range (0, 450, 1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (maxaz), 360);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (maxaz), TRUE);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (maxaz), FALSE);
- gtk_table_attach_defaults (GTK_TABLE (table), maxaz, 3, 4, 3, 4);
+ gtk_table_attach_defaults (GTK_TABLE (table), maxaz, 3, 4, 5, 6);
label = gtk_label_new (_(" Min El"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 4, 5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 6, 7);
minel = gtk_spin_button_new_with_range (-10, 180, 1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (minel), 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (minel), TRUE);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (minel), FALSE);
- gtk_table_attach_defaults (GTK_TABLE (table), minel, 1, 2, 4, 5);
+ gtk_table_attach_defaults (GTK_TABLE (table), minel, 1, 2, 6, 7);
label = gtk_label_new (_(" Max El"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 4, 5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 6, 7);
maxel = gtk_spin_button_new_with_range (-10, 180, 1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (maxel), 90);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (maxel), TRUE);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (maxel), FALSE);
- gtk_table_attach_defaults (GTK_TABLE (table), maxel, 3, 4, 4, 5);
+ gtk_table_attach_defaults (GTK_TABLE (table), maxel, 3, 4, 6, 7);
if (conf->name != NULL)
update_widgets (conf);
@@ -253,6 +275,8 @@
else
gtk_spin_button_set_value (GTK_SPIN_BUTTON (port), 4533); /* hamlib default? */
+ gtk_combo_box_set_active (GTK_COMBO_BOX (aztype), conf->aztype);
+
/* az and el limits */
gtk_spin_button_set_value (GTK_SPIN_BUTTON (minaz), conf->minaz);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (maxaz), conf->maxaz);
@@ -275,6 +299,7 @@
gtk_entry_set_text (GTK_ENTRY (name), "");
gtk_entry_set_text (GTK_ENTRY (host), "");
gtk_spin_button_set_value (GTK_SPIN_BUTTON (port), 4533); /* hamlib default? */
+ gtk_combo_box_set_active (GTK_COMBO_BOX (aztype), ROT_AZ_TYPE_360);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (minaz), 0);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (maxaz), 360);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (minel), 0);
@@ -307,6 +332,9 @@
/* port */
conf->port = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (port));
+ /* az type */
+ conf->aztype = gtk_combo_box_get_active (GTK_COMBO_BOX (aztype));
+
/* az and el ranges */
conf->minaz = gtk_spin_button_get_value (GTK_SPIN_BUTTON (minaz));
conf->maxaz = gtk_spin_button_get_value (GTK_SPIN_BUTTON (maxaz));
@@ -376,3 +404,28 @@
}
+
+static void aztype_changed_cb (GtkComboBox *box, gpointer data)
+{
+ gint type = gtk_combo_box_get_active (box);
+
+ switch (type) {
+
+ case ROT_AZ_TYPE_360:
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (minaz), 0.0);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (maxaz), 360.0);
+ break;
+
+ case ROT_AZ_TYPE_180:
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (minaz), -180.0);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (maxaz), +180.0);
+ break;
+
+ default:
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s:%s: Invalid AZ rotator type."),
+ __FILE__, __FUNCTION__);
+ break;
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-17 22:06:53
|
Revision: 131
http://gpredict.svn.sourceforge.net/gpredict/?rev=131&view=rev
Author: csete
Date: 2008-09-17 22:07:05 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
Added better management of missing config elements. Az-type and min/max should fall back to defaults in case they are not specified.
Modified Paths:
--------------
trunk/src/rotor-conf.c
Modified: trunk/src/rotor-conf.c
===================================================================
--- trunk/src/rotor-conf.c 2008-09-17 21:55:33 UTC (rev 130)
+++ trunk/src/rotor-conf.c 2008-09-17 22:07:05 UTC (rev 131)
@@ -111,52 +111,48 @@
conf->aztype = g_key_file_get_integer (cfg, GROUP, KEY_AZTYPE, &error);
if (error != NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Error reading rotor conf from %s (%s)."),
- __FUNCTION__, conf->name, error->message);
+ sat_log_log (SAT_LOG_LEVEL_WARN,
+ _("%s: Az type not defined for %s. Assuming 0..360\302\260"),
+ __FUNCTION__, conf->name);
g_clear_error (&error);
- g_key_file_free (cfg);
- return FALSE;
+
+ conf->aztype = ROT_AZ_TYPE_360;
}
conf->minaz = g_key_file_get_double (cfg, GROUP, KEY_MINAZ, &error);
if (error != NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Error reading rotor conf from %s (%s)."),
- __FUNCTION__, conf->name, error->message);
+ sat_log_log (SAT_LOG_LEVEL_WARN,
+ _("%s: MinAz not defined for %s. Assuming 0\302\260."),
+ __FUNCTION__, conf->name);
g_clear_error (&error);
- g_key_file_free (cfg);
- return FALSE;
+ conf->minaz = 0.0;
}
conf->maxaz = g_key_file_get_double (cfg, GROUP, KEY_MAXAZ, &error);
if (error != NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Error reading rotor conf from %s (%s)."),
- __FUNCTION__, conf->name, error->message);
+ sat_log_log (SAT_LOG_LEVEL_WARN,
+ _("%s: MaxAz not defined for %s. Assuming 360\302\260."),
+ __FUNCTION__, conf->name);
g_clear_error (&error);
- g_key_file_free (cfg);
- return FALSE;
+ conf->maxaz = 360.0;
}
conf->minel = g_key_file_get_double (cfg, GROUP, KEY_MINEL, &error);
if (error != NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Error reading rotor conf from %s (%s)."),
- __FUNCTION__, conf->name, error->message);
+ sat_log_log (SAT_LOG_LEVEL_WARN,
+ _("%s: MinEl not defined for %s. Assuming 0\302\260."),
+ __FUNCTION__, conf->name);
g_clear_error (&error);
- g_key_file_free (cfg);
- return FALSE;
+ conf->minel = 0.0;
}
conf->maxel = g_key_file_get_double (cfg, GROUP, KEY_MAXEL, &error);
if (error != NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Error reading rotor conf from %s (%s)."),
- __FUNCTION__, conf->name, error->message);
+ sat_log_log (SAT_LOG_LEVEL_WARN,
+ _("%s: MaxEl not defined for %s. Assuming 90\302\260."),
+ __FUNCTION__, conf->name);
g_clear_error (&error);
- g_key_file_free (cfg);
- return FALSE;
+ conf->maxel = 90.0;
}
g_key_file_free (cfg);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-17 21:03:56
|
Revision: 129
http://gpredict.svn.sourceforge.net/gpredict/?rev=129&view=rev
Author: csete
Date: 2008-09-17 21:04:02 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
Got rid og rdv and GtkMet dependency (second try).
Modified Paths:
--------------
trunk/src/menubar.c
Modified: trunk/src/menubar.c
===================================================================
--- trunk/src/menubar.c 2008-09-17 21:02:29 UTC (rev 128)
+++ trunk/src/menubar.c 2008-09-17 21:04:02 UTC (rev 129)
@@ -225,12 +225,12 @@
}
/* load custom icons */
- icon = icon_file_name ("gpredict-shuttle-small.png");
+/* icon = icon_file_name ("gpredict-shuttle-small.png");
image = gtk_image_new_from_file (icon);
g_free (icon);
menuitem = gtk_ui_manager_get_widget (uimgr, "/GpredictMenu/ToolsMenu/Rdv");
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
-
+*/
/* now, finally, get the menubar */
menubar = gtk_ui_manager_get_widget (uimgr, "/GpredictMenu");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-17 21:02:20
|
Revision: 128
http://gpredict.svn.sourceforge.net/gpredict/?rev=128&view=rev
Author: csete
Date: 2008-09-17 21:02:29 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
Got rid og rdv and GtkMet dependency.
Modified Paths:
--------------
trunk/src/gtk-sat-module.c
trunk/src/menubar.c
Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c 2008-09-17 20:30:05 UTC (rev 127)
+++ trunk/src/gtk-sat-module.c 2008-09-17 21:02:29 UTC (rev 128)
@@ -63,7 +63,6 @@
#include "gtk-sat-map.h"
#include "gtk-polar-view.h"
#include "gtk-single-sat.h"
-#include "gtk-met.h"
#include "gtk-rig-ctrl.h"
#include "gtk-rot-ctrl.h"
@@ -509,13 +508,6 @@
0);
break;
- case GTK_SAT_MOD_VIEW_MET:
- view = gtk_met_new (module->cfgdata,
- module->satellites,
- module->qth);
-
- break;
-
default:
sat_log_log (SAT_LOG_LEVEL_BUG,
_("%s:%d: Invalid child type (%d)\nUsing GtkSatList..."),
@@ -924,11 +916,6 @@
gtk_single_sat_update (child);
}
- else if (IS_GTK_MET(child)) {
- GTK_MET (child)->tstamp = tstamp;
- gtk_met_update (child);
- }
-
else {
sat_log_log (SAT_LOG_LEVEL_BUG,
_("%f:%d: Unknown child type"),
@@ -1002,18 +989,8 @@
*/
/* check that we have a GtkMet child */
/**** FIXME: GtkMet may not be child 2.... */
- if ((sat->tle.catnr == 99122) &&
- (IS_GTK_MET (module->child_2) &&
- (module->tmgCdnum - GTK_MET (module->child_2)->launch) < 0.002778)) {
+ if G_UNLIKELY(FALSE) {
- sat->ssplat = 28.51;
- sat->ssplon = -80.55;
- sat->alt = 0.0;
- sat->footprint = 500.0;
- sat->phase = 0.0;
- sat->orbit = 0;
- sat->range = obs_set.range;
- sat->range_rate = 0.0;
}
else {
@@ -1572,9 +1549,6 @@
else if (IS_GTK_SAT_LIST (widget)) {
}
- else if (IS_GTK_MET (widget)) {
- gtk_met_reload_sats (widget, module->satellites);
- }
else {
sat_log_log (SAT_LOG_LEVEL_BUG,
Modified: trunk/src/menubar.c
===================================================================
--- trunk/src/menubar.c 2008-09-17 20:30:05 UTC (rev 127)
+++ trunk/src/menubar.c 2008-09-17 21:02:29 UTC (rev 128)
@@ -50,7 +50,6 @@
#include "gpredict-help.h"
#include "tle-update.h"
#include "compat.h"
-#include "rdv.h"
#include "menubar.h"
#include "config-keys.h"
#ifdef HAVE_CONFIG_H
@@ -66,7 +65,6 @@
static void menubar_open_mod_cb (GtkWidget *widget, gpointer data);
static void menubar_message_log (GtkWidget *widget, gpointer data);
static void menubar_app_exit_cb (GtkWidget *widget, gpointer data);
-static void menubar_rdv_cb (GtkWidget *widget, gpointer data);
static void menubar_freq_edit_cb (GtkWidget *widget, gpointer data);
static void menubar_pref_cb (GtkWidget *widget, gpointer data);
static void menubar_tle_net_cb (GtkWidget *widget, gpointer data);
@@ -127,8 +125,6 @@
G_CALLBACK (menubar_window_cb)},
{ "Predict", GTK_STOCK_DND_MULTIPLE, N_("Advanced Predict"), NULL,
N_("Open advanced pass predictor"), G_CALLBACK (menubar_predict_cb)},
- { "Rdv", NULL, N_("_Space Shuttle Tool"), NULL,
- N_("Open the space shuttle tool window"), G_CALLBACK (menubar_rdv_cb)},
/* Help menu */
{ "GettingStarted", GTK_STOCK_EXECUTE, N_("Getting Started"), NULL,
@@ -172,8 +168,6 @@
" <menu action='ToolsMenu'>"
" <menuitem action='Window'/>"
" <menuitem action='Predict'/>"
-" <separator/>"
-" <menuitem action='Rdv'/>"
/* " <separator/>" */
/* " <menuitem action='Lab'/>" */
" </menu>"
@@ -740,13 +734,7 @@
-static void
-menubar_rdv_cb (GtkWidget *widget, gpointer data)
-{
- rdv_open ();
-}
-
static void
menubar_window_cb (GtkWidget *widget, gpointer data)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-17 18:55:55
|
Revision: 124
http://gpredict.svn.sourceforge.net/gpredict/?rev=124&view=rev
Author: csete
Date: 2008-09-17 18:56:05 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/NEWS
trunk/README
trunk/TODO
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-09-17 18:43:42 UTC (rev 123)
+++ trunk/NEWS 2008-09-17 18:56:05 UTC (rev 124)
@@ -2,19 +2,9 @@
Changes in version 1.0 (TBD):
- Radio doppler tuning via hamlibs rigctld.
-x Antenna rotator control via hamlibs rotctld.
-x New layout engine allowing any number of views per module.
-x SpaceView: New view show the satellites using a movable camera in space.
-x SkyView:
-x The satellite map can show the range circle of the ground station according to
- the selected satellite.
-x The satellite map can show day/night side of Earh.
-x Track the Sun and the Moon as if they were satellites.
+- Antenna rotator control via hamlibs rotctld.
- User defined twilight threshold for predicting satellite visibility.
-x Define obstacles for ground stations.
-x Feature request 1613758: Command Line Interface to Gpredict.
- Feature request 1705375: Restore main window position and size.
-x Fixed bug 1650251: Groundtracks have discontinuities.
- Fixed bug 1752908: New satellites in TLE files.
- Fixed bug 1818144: No log file created at first execution.
- Fixed bug 1839140: Sky at a glance axis incorrectly labelled.
@@ -23,7 +13,7 @@
- Fixed bug 1954664: Wrong overpass prediction.
- Fixed bug 1880815: Null pointer dereference causes crash on startup.
x Windows: New installer instead of ZIP distribution.
-x Updated user manual as PDF and HTML (online).
+- Updated PDF user manual as PDF.
Changes in version 0.9.0 (2007-09-29):
Modified: trunk/README
===================================================================
--- trunk/README 2008-09-17 18:43:42 UTC (rev 123)
+++ trunk/README 2008-09-17 18:56:05 UTC (rev 124)
@@ -13,51 +13,48 @@
well. Gpredict uses the SGP4/SDP4 algorithms, which are compatible with the
NORAD Keplerian elements.
-Gpredict aims to have the following features as we move towards version 1.0:
- * Be able to track a large number of satellites (only limited by
- the physical memory of the computer)
- * Track for several ground stations, not just one.
- * Show the satellite data using various visualization modules
- (lists, maps, polar views, etc.)
- * Predict upcomming passes for the satellites.
- * Automatically update keplerian elements.
- * Control your receiver/transmitter and antenna rotators.
- * Advanced schedule manager for unattended monitoring of satellites.
- * External hooks for performing certain actions during satellite passes.
- * Any desirable feature that is missing from other programs (feel
- free to submit your ideas)
+FEATURES
+========
+Gpredict includes the following features:
-STATUS
-======
+ * Tracking an infinite number of satellites only limited by the
+ physical memory and processing power of the computer.
+ * Display the tracking data in lists, maps, polar plots and any
+ combination of these.
+ * You can have many modules open at the same either in a
+ notebook or in their own windows. The module can also run in
+ full-screen mode.
+ * You can use many ground stations. Ground station coordinates
+ can either be entered manually or you can get some appriximate values
+ from a list with more than 2000 predefined locations worldwide.
+ * Predict upcoming passes for satellites, including passes where a
+ satellite may be visible and communication windows
+ * Very detailed information about both the real time data and the
+ predicted passes.
+ * Gpredict can run in real-time, simulated real-time (fast forward and
+ backward), and manual time control.
+ * Doppler tuning of radios via Hamlib rigctld.
+ * Antenna rotator control via Hamlib rotctld.
-At the present the following features are implemented:
-
- * Tracking an infinite number of satellites only limited by the
- physical memory and processing power of the computer.
- * Display the tracking data in lists, maps, polar plots and any
- combination of these.
- * You can have many modules open at the same either in a
- notebook or in their own windows. The module can also run in
- full-screen mode.
- * You can use many ground stations. Ground station coordinates
- can either be entered manually or you can get some appriximate values
- from a list with more than 2000 predefined locations worldwide.
- * Predict upcoming passes for satellites, including passes where a
- satellite may be visible and communication windows
- * Very detailed information about both the real time data and the
- predicted passes.
-
Visit the gpredict homepage at http://gpredcit.oz9aec.net/ for more info.
-
REQUIREMENTS
============
Gpredict is written using the Gtk+ widget set, which is available for most
-Unix like operating systems, Mac and Windows.
+Unix like operating systems, Mac and Windows. Following libraries are required
+for successful compilation of Gpredict:
+
+- Gtk+ 2.12 or later
+- Curl and libcurl (optional but highly recommended)
+- Hamlib (runtime only, not required for build)
+
+If you compile Gpredict from source you will also need the development parts
+of the above mentioned libraries, i.e. gtk+-dev or gtk+-devel and so on.
+
To install gpredict from source unpack the source package with:
tar -xvfz gpredict-x.y.z.tar.gz
@@ -80,7 +77,7 @@
to just install everything if you can (except if you are running Debian ;-).
If you want to know more about installation options refer to the INSTALL file
-(not for begiiners).
+(not for beginners).
USING GPREDICT
@@ -96,18 +93,6 @@
-UPGRADING FROM 0.5
-==================
-
-As of version 0.6 most of the program has been rewritten breaking compatibility
-with earlier versions. Although earlier versions will not cause any known
-troubles, I strongly suggest that you remove any pre 0.6 versions before
-installing version 0.6 or later. Gpredict 0.6 or later will not be able to use
-configuration or other user data from pre 0.6 versions.
-
-
-
-
LICENSE AND WARRANTY
====================
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2008-09-17 18:43:42 UTC (rev 123)
+++ trunk/TODO 2008-09-17 18:56:05 UTC (rev 124)
@@ -1,13 +1,8 @@
Future plans for gpredict development include:
-* Add new satellites to database when updating TLE.
-* Print predicted satellite passes.
-* Choose between civil, nautical, and astronomical twilight when predicting
- satellite visibilities.
* Show day/night on satmap.
* Optionally, use simulated time as T0 for predictions.
* TLE editor.
-* Automated radio and antenna rotator.
* Advanced pass predictor.
* Predict communication windows between two ground stations.
* Determine all orbit types.
@@ -15,8 +10,6 @@
* Scheduler / External Hooks (menubar, see 1313635, 724998)
* Save future pass prediction reports as HTML.
* Print future pass predictions.
-* Possibility to show geographical coordinates for ground station on map
- and polar views.
* Online help.
* Native Mac OS X port.
* Dynamic reconfiguration. No need to re-load modules if configuration changes
@@ -28,3 +21,10 @@
* Improve time controller to have tuning-like behaviour, i.e. when
minutes flip from 59 to 0 the hour is incremented.
* Toggle the ground track on and off for all the satellites on the map.
+* New layout engine allowing any number of views per module.
+* SpaceView: New view show the satellites using a movable camera in space.
+* SkyView:
+* The satellite map can show the range circle of the ground station according to
+ the selected satellite.
+x Define obstacles for ground stations.
+x Feature request 1613758: Command Line Interface to Gpredict.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-17 18:43:32
|
Revision: 123
http://gpredict.svn.sourceforge.net/gpredict/?rev=123&view=rev
Author: csete
Date: 2008-09-17 18:43:42 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
Updated TLE.
Modified Paths:
--------------
trunk/data/amateur.tle
trunk/data/cubesat.tle
trunk/data/galileo.tle
trunk/data/geo.tle
trunk/data/gps-ops.tle
trunk/data/iridium.tle
trunk/data/military.tle
trunk/data/radar.tle
trunk/data/science.tle
trunk/data/weather.tle
Modified: trunk/data/amateur.tle
===================================================================
--- trunk/data/amateur.tle 2008-09-17 18:41:40 UTC (rev 122)
+++ trunk/data/amateur.tle 2008-09-17 18:43:42 UTC (rev 123)
@@ -1,183 +1,174 @@
OSCAR III [-]
-1 01293U 65016F 07359.95047459 .00000021 00000-0 46445-4 0 1565
-2 01293 70.0709 256.7049 0018937 178.2497 181.8684 14.04603273184086
+1 01293U 65016F 08260.99766534 -.00000058 00000-0 -26336-5 0 3408
+2 01293 70.0720 41.8001 0018132 180.9416 179.1662 14.04658852221449
AO-5 [-]
-1 04321U 70008B 07359.91137455 -.00000031 00000-0 10000-3 0 9409
-2 04321 102.1137 349.9776 0027742 280.7557 79.0390 12.52152125733263
+1 04321U 70008B 08261.04495502 -.00000031 00000-0 10000-3 0 542
+2 04321 102.1304 260.9931 0027730 136.5005 223.8260 12.52154398766576
AO-6 [-]
-1 06236U 72082B 07359.92831502 -.00000027 00000-0 10000-3 0 9376
-2 06236 101.4337 23.3982 0003802 225.2529 134.8235 12.53072478609869
+1 06236U 72082B 08259.91187074 -.00000027 00000-0 10000-3 0 475
+2 06236 101.4145 278.2333 0004224 66.6725 293.4792 12.53074975643054
AO-7 [P]
-1 07530U 74089B 07359.75684309 -.00000028 00000-0 10000-3 0 625
-2 07530 101.4911 31.9440 0011843 242.3961 117.5904 12.53573026515124
+1 07530U 74089B 08260.51241670 -.00000027 00000-0 10000-3 0 2790
+2 07530 101.4605 288.9346 0012209 83.7193 276.5272 12.53574121548424
AO-8 [-]
-1 10703U 78026B 07359.95107380 .00000324 00000-0 25507-3 0 162
-2 10703 98.9116 51.6934 0005613 218.0890 141.9887 13.98808209520630
+1 10703U 78026B 08261.18017256 -.00000302 00000-0 -18007-3 0 2686
+2 10703 98.8750 309.8434 0006245 204.0771 156.0100 13.98819039557853
AO-10 [-]
-1 14129U 83058B 07358.44681785 .00000108 00000-0 10000-3 0 4557
-2 14129 25.9521 239.2609 6044383 84.1762 337.5108 2.05868490156517
+1 14129U 83058B 08259.99927279 -.00000079 00000-0 10000-3 0 5604
+2 14129 26.0334 195.4003 5964421 157.3627 246.9367 2.05869022162001
UO-11 [P]
-1 14781U 84021B 07359.84712745 .00000175 00000-0 30630-4 0 5555
-2 14781 98.1740 26.0837 0008007 275.5750 84.4561 14.79605383278072
+1 14781U 84021B 08261.15450383 .00000341 00000-0 52618-4 0 7691
+2 14781 98.1473 296.5289 0009894 132.8717 227.3310 14.79665128317452
FO-12 [-]
-1 16909U 86061B 07359.87538197 -.00000083 00000-0 10000-3 0 3257
-2 16909 50.0179 19.8593 0010710 274.1963 85.7651 12.44451113971820
+1 16909U 86061B 08260.22329166 -.00000083 00000-0 10000-3 0 4422
+2 16909 50.0167 284.1238 0011119 227.3316 132.6583 12.44451922 4861
UO-14 [-]
-1 20437U 90005B 07359.53208833 .00000007 00000-0 18107-4 0 5260
-2 20437 98.2629 330.1945 0010923 337.2703 22.7996 14.31503409935843
+1 20437U 90005B 08261.04701773 -.00000006 00000-0 13176-4 0 7353
+2 20437 98.2979 224.5018 0009817 262.4727 97.5337 14.31523904973970
UO-15 [-]
-1 20438U 90005C 07359.96516212 .00000003 00000-0 17140-4 0 112
-2 20438 98.3211 320.9511 0010244 359.5992 0.5181 14.30415084935380
+1 20438U 90005C 08261.05341439 -.00000009 00000-0 12561-4 0 2247
+2 20438 98.3570 216.2072 0009212 289.7803 70.2387 14.30430430973426
AO-16 [P]
-1 20439U 90005D 07359.50279662 .00000032 00000-0 27324-4 0 2128
-2 20439 98.2121 343.6747 0010849 342.5266 17.5544 14.31779959935926
+1 20439U 90005D 08261.03622344 .00000006 00000-0 17679-4 0 4190
+2 20439 98.2410 236.4503 0009946 264.5172 95.4874 14.31802837974062
DO-17 [-]
-1 20440U 90005E 07359.82694185 .00000026 00000-0 24652-4 0 9071
-2 20440 98.1951 349.7987 0010945 338.5968 21.4757 14.32081140936090
+1 20440U 90005E 08261.02481697 .00000014 00000-0 20468-4 0 1225
+2 20440 98.2197 241.7804 0009988 260.2462 99.7598 14.32105559974192
WO-18 [-]
-1 20441U 90005F 07359.88171626 .00000034 00000-0 27982-4 0 4194
-2 20441 98.1996 348.3238 0011643 340.9442 19.1305 14.31848170936045
+1 20441U 90005F 08261.05314010 .00000013 00000-0 19951-4 0 6312
+2 20441 98.2251 240.3550 0010617 263.9056 96.0915 14.31871520974131
LO-19 [P]
-1 20442U 90005G 07359.92850703 .00000045 00000-0 31927-4 0 1362
-2 20442 98.1876 353.0836 0011470 338.8852 21.1861 14.32019325936132
+1 20442U 90005G 08261.06831315 .00000044 00000-0 31605-4 0 3429
+2 20442 98.2092 244.7332 0010936 260.5952 99.4028 14.32040758974227
FO-20 [-]
-1 20480U 90013C 07359.78519914 .00000001 00000-0 81779-4 0 7169
-2 20480 99.0185 11.0041 0539956 312.4050 43.2521 12.83356123837714
+1 20480U 90013C 08260.86106956 -.00000006 00000-0 52416-4 0 9386
+2 20480 99.0379 226.5846 0540826 69.2360 296.5835 12.83359092871845
AO-21 [-]
-1 21087U 91006A 07359.75438267 -.00000008 00000-0 -23558-4 0 8413
-2 21087 82.9425 85.5992 0035171 352.0042 8.0557 13.75027148848284
+1 21087U 91006A 08260.49782683 .00000041 00000-0 27677-4 0 693
+2 21087 82.9375 248.7308 0034638 330.5725 29.3480 13.75036458884801
RS-12 & RS-13 [-]
-1 21089U 91007A 07359.40960390 .00000034 00000-0 19725-4 0 7221
-2 21089 82.9212 307.2332 0030509 35.6350 324.6837 13.74476689847046
+1 21089U 91007A 08259.67748191 .00000029 00000-0 14692-4 0 9496
+2 21089 82.9195 110.3877 0030048 16.8964 343.3198 13.74481935883489
UO-22 [-]
-1 21575U 91050B 07359.85143674 .00000013 00000-0 17844-4 0 1676
-2 21575 98.3751 307.5616 0007029 190.8669 169.2367 14.39621316863108
+1 21575U 91050B 08260.90603962 -.00000040 00000-0 91192-6 0 3757
+2 21575 98.4043 208.2168 0008223 115.8124 244.3916 14.39648729901387
KO-23 [-]
-1 22077U 92052B 07359.53777152 -.00000037 00000-0 10000-3 0 3064
-2 22077 66.0860 16.8712 0011473 221.1423 138.8730 12.86442797722104
+1 22077U 92052B 08260.49133233 -.00000037 00000-0 10000-3 0 5362
+2 22077 66.0844 179.8682 0003569 345.5419 14.5496 12.86445577756313
AO-24 [-]
-1 22654U 93031B 07359.45184840 -.00000129 00000-0 10000-3 0 935
-2 22654 5.4825 347.0092 2907965 130.1285 259.3576 1.42205278 71442
+1 22654U 93031B 08259.52379467 -.00000097 00000-0 10000-3 0 1782
+2 22654 5.2882 342.5105 2892469 144.8942 238.0872 1.42205750 75219
AO-27 [+]
-1 22825U 93061C 07359.88146857 -.00000073 00000-0 -12469-4 0 8592
-2 22825 98.3589 321.6763 0009305 58.3413 301.8683 14.29225989742870
-IO-26 [-]
-1 22826U 93061D 07359.82573656 .00000013 00000-0 21375-4 0 5616
-2 22826 98.3526 322.6135 0009842 55.2009 305.0100 14.29473763742953
+1 22825U 93061C 08260.98017841 .00000022 00000-0 25043-4 0 636
+2 22825 98.3951 217.6043 0008389 356.5982 3.5163 14.29246884780882
+IO-26 [P]
+1 22826U 93061D 08260.52827630 .00000000 00000-0 16517-4 0 7743
+2 22826 98.3873 218.0370 0008973 353.8260 6.2810 14.29496363780914
KO-25 [-]
-1 22828U 93061F 07359.97409701 -.00000000 00000-0 16071-4 0 7923
-2 22828 98.3460 322.7808 0010456 32.5279 327.6544 14.29779482711236
+1 22828U 93061F 08261.04004493 .00000025 00000-0 25868-4 0 9981
+2 22828 98.3819 218.4986 0009375 325.7658 34.2920 14.29799335749259
PO-28 [+]
-1 22829U 93061G 07359.96767289 .00000013 00000-0 20916-4 0 8344
-2 22829 98.3420 323.8845 0010254 30.0470 330.1301 14.30175970743226
+1 22829U 93061G 08261.09971727 .00000012 00000-0 20918-4 0 382
+2 22829 98.3771 219.6761 0009178 322.4893 37.5648 14.30196971781266
RS-15 [P]
-1 23439U 94085A 07359.64570520 -.00000039 00000-0 10000-3 0 842
-2 23439 64.8189 57.2998 0152802 155.8915 204.9257 11.27552334535286
+1 23439U 94085A 08260.18883265 -.00000039 00000-0 10000-3 0 1454
+2 23439 64.8189 347.8919 0146342 105.2697 256.4456 11.27552848565225
FO-29 [P]
-1 24278U 96046B 07359.96283012 -.00000101 00000-0 -63573-4 0 6846
-2 24278 98.5785 294.0831 0350222 306.6789 50.2629 13.52934610560837
+1 24278U 96046B 08260.23106202 -.00000032 00000-0 56243-5 0 8585
+2 24278 98.5778 164.5772 0350463 340.0321 18.7384 13.52940002596709
MO-30 [-]
-1 24305U 96052B 07359.61791451 .00000012 00000-0 -28393-5 0 6917
-2 24305 82.9353 33.0962 0029121 318.5782 41.3175 13.73552885566609
+1 24305U 96052B 08259.91801416 .00000026 00000-0 11977-4 0 9122
+2 24305 82.9373 196.8698 0028844 299.9805 59.8497 13.73561997603027
TO-31 [-]
-1 25396U 98043C 07359.83688044 -.00000128 00000-0 -37705-4 0 9937
-2 25396 98.4019 42.9474 0003038 28.5982 331.5359 14.23745521491553
+1 25396U 98043C 08260.62422065 .00000084 00000-0 54669-4 0 2069
+2 25396 98.3677 296.3734 0002272 334.9292 25.1769 14.23762834529372
GO-32 [P]
-1 25397U 98043D 07359.88918174 -.00000082 00000-0 -18130-4 0 4860
-2 25397 98.3903 38.4525 0001950 56.5352 303.5996 14.23135525491424
+1 25397U 98043D 08260.57991644 -.00000178 00000-0 -60890-4 0 6982
+2 25397 98.3578 291.1991 0001261 18.5302 341.5939 14.23147354529216
SO-33 [P]
-1 25509U 98061B 07359.65145138 .00000024 00000-0 -85160-5 0 951
-2 25509 31.4324 223.2153 0355420 301.2151 55.4101 14.28188006478643
+1 25509U 98061B 08260.12874437 -.00000007 00000-0 -12410-4 0 2812
+2 25509 31.4288 162.1400 0354510 102.3815 261.6714 14.28224411516627
PO-34 [-]
-1 25520U 98064B 07359.94136439 .00000495 00000-0 14617-4 0 8972
-2 25520 28.4607 265.2662 0005717 185.1416 174.9120 15.17106105506673
+1 25520U 98064B 08260.43199379 .00000288 00000-0 44172-5 0 815
+2 25520 28.4605 287.8843 0005643 199.3838 160.6541 15.17227918547035
ARISS [+]
-1 25544U 98067A 07359.91480693 .00015286 00000-0 91687-4 0 5773
-2 25544 51.6378 195.2538 0000649 29.9790 109.8479 15.78026441521026
+1 25544U 98067A 08260.52254209 .00005033 00000-0 42102-4 0 2622
+2 25544 51.6420 267.9221 0006994 117.9417 30.5893 15.72081521562909
SO-35 [-]
-1 25636U 99008C 07359.87545121 .00000008 00000-0 96837-5 0 8923
-2 25636 96.4774 301.7202 0149051 128.7617 232.7007 14.43416247465303
+1 25636U 99008C 08260.58499448 -.00000004 00000-0 70012-5 0 1100
+2 25636 96.4718 144.3648 0148660 8.8939 351.4836 14.43441833503633
UO-36 [-]
-1 25693U 99021A 07359.92694164 -.00000090 00000-0 77903-5 0 5178
-2 25693 64.5584 332.5153 0049416 260.1398 99.4143 14.78689561468108
+1 25693U 99021A 08261.11967964 -.00000131 00000-0 18901-5 0 7275
+2 25693 64.5561 234.7415 0034474 225.1049 134.7209 14.78721207507462
OO-38 [-]
-1 26063U 00004C 07359.87226228 -.00000017 00000-0 14518-4 0 940
-2 26063 100.2175 37.8254 0036708 341.0003 18.9795 14.35823445414556
+1 26063U 00004C 08261.20406819 -.00000039 00000-0 71228-5 0 3114
+2 26063 100.1888 352.3948 0036661 310.8009 48.9996 14.35843451452770
SO-41 [-]
-1 26545U 00057A 07359.45112793 .00000040 00000-0 23663-4 0 8504
-2 26545 64.5581 340.4918 0007692 37.7860 322.3787 14.80466563391296
+1 26545U 00057A 08260.92919391 -.00000018 00000-0 16733-4 0 684
+2 26545 64.5564 239.5363 0039401 321.4615 38.3693 14.80528489430743
MO-46 [-]
-1 26548U 00057D 07359.94469935 -.00000046 00000-0 12207-4 0 9829
-2 26548 64.5581 309.4062 0008697 346.9642 13.1235 14.83212133391976
+1 26548U 00057D 08260.79313920 -.00000003 00000-0 17925-4 0 2004
+2 26548 64.5561 206.8064 0038241 310.9544 48.8255 14.83295115431407
SO-42 [-]
-1 26549U 00057E 07359.94317000 -.00000046 00000-0 12743-4 0 9291
-2 26549 64.5585 352.6367 0009814 62.7964 297.4149 14.79325994391090
+1 26549U 00057E 08261.15364265 -.00000061 00000-0 11320-4 0 1426
+2 26549 64.5560 253.9815 0040919 328.0136 31.8446 14.79385541430474
AO-40 [-]
-1 26609U 00072B 07355.45415945 -.00000211 00000-0 10000-3 0 9808
-2 26609 7.1690 105.9357 7928711 34.4599 357.0512 1.25582831 32796
+1 26609U 00072B 08258.76573546 -.00000396 00000-0 10000-3 0 1195
+2 26609 7.7949 60.7969 7934888 122.9745 337.5321 1.25586678 36163
NO-44 [P]
-1 26931U 01043C 07359.51413583 -.00000248 00000-0 -64650-4 0 7644
-2 26931 67.0516 14.6307 0004946 257.9742 102.0811 14.29505432325444
+1 26931U 01043C 08260.51868395 -.00000261 00000-0 -69594-4 0 9785
+2 26931 67.0524 49.3712 0007258 263.0620 96.9636 14.29531717363465
NO-45 [-]
-1 26932U 01043D 07359.98956928 -.00000073 00000-0 39126-5 0 7771
-2 26932 67.0530 13.2200 0005980 237.1005 122.9521 14.29573020325558
+1 26932U 01043D 08260.98247143 -.00000038 00000-0 17584-4 0 9805
+2 26932 67.0548 48.0575 0008175 275.8243 84.1925 14.29592131363575
BO-47 & BO-48 [-]
-1 27422U 02021B 07359.82164459 .00000121 00000-0 65616-4 0 6387
-2 27422 98.5677 79.2895 0012649 10.6906 349.4542 14.28424285292403
+1 27422U 02021B 08260.85722716 .00000016 00000-0 23723-4 0 8511
+2 27422 98.5483 340.1089 0011673 308.4799 51.5336 14.28459730330382
AO-49 [-]
-1 27605U 02058A 07359.90953773 .00000064 00000-0 31546-4 0 5216
-2 27605 64.5571 212.5421 0074633 315.0696 44.4329 14.72321159269547
+1 27605U 02058A 08261.09779708 .00000023 00000-0 25198-4 0 7283
+2 27605 64.5576 122.8750 0085378 262.2373 96.9036 14.72363774308734
SO-50 [+]
-1 27607U 02058C 07359.59818016 .00000145 00000-0 44481-4 0 4898
-2 27607 64.5576 223.8367 0075645 314.6016 44.8932 14.71315025269282
+1 27607U 02058C 08261.10226902 -.00000036 00000-0 16750-4 0 7009
+2 27607 64.5583 134.4924 0086219 261.4648 97.6713 14.71379763308494
DTUSAT [-]
-1 27842U 03031C 07359.58509621 .00000039 00000-0 38327-4 0 1834
-2 27842 98.7133 6.2390 0008771 239.0595 120.9724 14.20909059232711
+1 27842U 03031C 08259.91344591 .00000019 00000-0 28906-4 0 3779
+2 27842 98.7123 267.9253 0008862 191.2910 168.8081 14.20945799270399
CO-55 [+]
-1 27844U 03031E 07359.76017437 .00000080 00000-0 57535-4 0 1967
-2 27844 98.7177 5.4397 0009051 259.4867 100.5284 14.20551344232679
+1 27844U 03031E 08260.57700588 .00000020 00000-0 29576-4 0 3964
+2 27844 98.7181 267.5843 0009161 208.9877 151.0797 14.20596148270418
AAU CUBESAT [-]
-1 27846U 03031G 07359.58495365 .00000011 00000-0 25411-4 0 1286
-2 27846 98.7132 6.2352 0008795 240.6688 119.3612 14.20909866232713
+1 27846U 03031G 08260.47647348 .00000019 00000-0 28983-4 0 3171
+2 27846 98.7128 268.4756 0009089 189.1621 170.9404 14.20946900270476
CANX-1 [-]
-1 27847U 03031H 07359.58797610 .00000041 00000-0 39122-4 0 1417
-2 27847 98.7131 6.2346 0008898 238.3434 121.6885 14.20898579232663
+1 27847U 03031H 08260.48191998 .00000017 00000-0 27894-4 0 3312
+2 27847 98.7132 268.4763 0009027 189.2852 170.8181 14.20932204270427
CO-57 [+]
-1 27848U 03031J 07359.59417429 .00000042 00000-0 39968-4 0 1527
-2 27848 98.7171 4.4107 0009112 265.1895 94.8231 14.20364623232622
+1 27848U 03031J 08260.58740604 .00000022 00000-0 30493-4 0 3470
+2 27848 98.7189 266.6750 0009091 214.1519 145.9078 14.20404329270380
RS-22 [+]
-1 27939U 03042A 07359.53160208 .00000155 00000-0 39052-4 0 3840
-2 27939 98.0176 240.6440 0014317 37.3829 322.8380 14.63190485226659
+1 27939U 03042A 08260.81503224 .00000045 00000-0 17743-4 0 5968
+2 27939 97.9802 139.0129 0012599 276.4395 83.5382 14.63257088265594
AO-51 [+]
-1 28375U 04025K 07359.50547911 .00000018 00000-0 18376-4 0 9901
-2 28375 98.0897 28.7356 0084241 323.4405 36.1052 14.40591762183254
+1 28375U 04025K 08260.24357242 -.00000003 00000-0 11898-4 0 1998
+2 28375 98.0679 279.6794 0082887 236.8095 122.5124 14.40618079221514
VO-52 [+]
-1 28650U 05017B 07359.40156519 -.00000089 00000-0 -46450-5 0 8148
-2 28650 97.8130 65.6262 0027061 353.2095 6.8739 14.81399376142721
+1 28650U 05017B 08260.78933598 -.00000188 00000-0 -17128-4 0 322
+2 28650 97.7819 324.8459 0026701 199.8251 160.1910 14.81497356182164
UWE-1 [-]
-1 28892U 05043C 07359.41245653 .00000157 00000-0 42733-4 0 9328
-2 28892 98.1148 252.0351 0016466 233.8202 126.1477 14.59576043115103
+1 28892U 05043C 08257.99387692 -.00000042 00000-0 86982-6 0 1433
+2 28892 98.0824 149.4552 0018330 129.3872 230.8990 14.59658296153554
XO-53 [-]
-1 28894U 05043E 07359.84420294 .00000026 00000-0 15235-4 0 416
-2 28894 98.1160 252.6951 0016644 235.1267 124.8369 14.59593414115178
+1 28894U 05043E 08260.62036392 .00000019 00000-0 13548-4 0 2639
+2 28894 98.0834 152.2693 0018257 123.0030 237.2928 14.59633335153942
CO-58 [+]
-1 28895U 05043F 07359.38534130 .00000096 00000-0 29838-4 0 9073
-2 28895 98.1166 252.2953 0016981 233.9849 125.9743 14.59618508114987
+1 28895U 05043F 08260.70142639 .00000163 00000-0 43748-4 0 1219
+2 28895 98.0853 152.4938 0018999 121.6669 238.6400 14.59696701153837
NCUBE-2 [-]
-1 28897U 05043H 07359.64424522 .00000159 00000-0 42979-4 0 4354
-2 28897 98.1137 252.4893 0016410 234.7568 125.2084 14.59786002107300
+1 28897U 05043H 08261.13497747 .00000066 00000-0 23282-4 0 6524
+2 28897 98.0836 152.8415 0018019 120.7854 239.5130 14.59868830146187
CO-56 [P]
-1 28941U 06005C 07359.89115623 .00011535 25479-5 10860-3 0 7414
-2 28941 98.1092 83.2004 0196877 310.3404 48.0643 15.47625567103002
-HO-59 [+]
-1 29484U 06041F 07359.79289037 .00034341 30509-5 16856-3 0 9779
-2 29484 98.2585 80.7628 0149137 290.5862 67.9330 15.67962152 70924
-ANDE (NO-61) [+]
-1 29664U 06055F 07358.92415850 .07309640 12639-4 13578-3 0 7382
-2 29664 51.6106 151.4698 0004293 300.9719 59.0915 16.47316101 58731
-FCAL [+]
-1 29667U 06055J 07359.89756518 .00026622 11602-4 65752-4 0 6144
-2 29667 51.6313 163.1325 0009517 22.6036 337.5392 15.97448239 58549
+1 28941U 06005C 08261.11557879 .00032347 27003-5 21545-3 0 3838
+2 28941 98.1179 24.7270 0152900 66.3288 295.3747 15.61321053144365
PEHUENSAT 1 [+]
-1 29712U 07001D 07359.80185667 .00000731 00000-0 10346-3 0 353
-2 29712 97.9013 56.0894 0013397 224.4182 135.5939 14.79957099 51674
+1 29712U 07001D 08261.22561522 .00000377 00000-0 56262-4 0 8015
+2 29712 97.8677 317.6488 0015427 82.6711 277.6255 14.80265875 91086
Modified: trunk/data/cubesat.tle
===================================================================
--- trunk/data/cubesat.tle 2008-09-17 18:41:40 UTC (rev 122)
+++ trunk/data/cubesat.tle 2008-09-17 18:43:42 UTC (rev 123)
@@ -1,54 +1,75 @@
DTUSAT
-1 27842U 03031C 07359.58509621 .00000039 00000-0 38327-4 0 1834
-2 27842 98.7133 6.2390 0008771 239.0595 120.9724 14.20909059232711
+1 27842U 03031C 08259.91344591 .00000019 00000-0 28906-4 0 3779
+2 27842 98.7123 267.9253 0008862 191.2910 168.8081 14.20945799270399
CUTE-1 (CO-55)
-1 27844U 03031E 07359.76017437 .00000080 00000-0 57535-4 0 1967
-2 27844 98.7177 5.4397 0009051 259.4867 100.5284 14.20551344232679
+1 27844U 03031E 08260.57700588 .00000020 00000-0 29576-4 0 3964
+2 27844 98.7181 267.5843 0009161 208.9877 151.0797 14.20596148270418
QUAKESAT
-1 27845U 03031F 07359.63647592 .00000093 00000-0 64068-4 0 1799
-2 27845 98.7224 4.6976 0008414 278.5765 81.4465 14.20160875232581
+1 27845U 03031F 08260.52524410 .00000047 00000-0 42642-4 0 3764
+2 27845 98.7239 266.9121 0008275 227.7245 132.3232 14.20217250270328
AAU CUBESAT
-1 27846U 03031G 07359.58495365 .00000011 00000-0 25411-4 0 1286
-2 27846 98.7132 6.2352 0008795 240.6688 119.3612 14.20909866232713
+1 27846U 03031G 08260.47647348 .00000019 00000-0 28983-4 0 3171
+2 27846 98.7128 268.4756 0009089 189.1621 170.9404 14.20946900270476
CANX-1
-1 27847U 03031H 07359.58797610 .00000041 00000-0 39122-4 0 1417
-2 27847 98.7131 6.2346 0008898 238.3434 121.6885 14.20898579232663
+1 27847U 03031H 08260.48191998 .00000017 00000-0 27894-4 0 3312
+2 27847 98.7132 268.4763 0009027 189.2852 170.8181 14.20932204270427
CUBESAT XI-IV (CO-57)
-1 27848U 03031J 07359.59417429 .00000042 00000-0 39968-4 0 1527
-2 27848 98.7171 4.4107 0009112 265.1895 94.8231 14.20364623232622
+1 27848U 03031J 08260.58740604 .00000022 00000-0 30493-4 0 3470
+2 27848 98.7189 266.6750 0009091 214.1519 145.9078 14.20404329270380
UWE-1
-1 28892U 05043C 07359.41245653 .00000157 00000-0 42733-4 0 9328
-2 28892 98.1148 252.0351 0016466 233.8202 126.1477 14.59576043115103
+1 28892U 05043C 08257.99387692 -.00000042 00000-0 86982-6 0 1433
+2 28892 98.0824 149.4552 0018330 129.3872 230.8990 14.59658296153554
CUBESAT XI-V (CO-58)
-1 28895U 05043F 07359.38534130 .00000096 00000-0 29838-4 0 9073
-2 28895 98.1166 252.2953 0016981 233.9849 125.9743 14.59618508114987
+1 28895U 05043F 08260.70142639 .00000163 00000-0 43748-4 0 1219
+2 28895 98.0853 152.4938 0018999 121.6669 238.6400 14.59696701153837
NCUBE-2
-1 28897U 05043H 07359.64424522 .00000159 00000-0 42979-4 0 4354
-2 28897 98.1137 252.4893 0016410 234.7568 125.2084 14.59786002107300
-CUTE-1.7 (CO-56)
-1 28941U 06005C 07359.89115623 .00011535 25479-5 10860-3 0 7414
-2 28941 98.1092 83.2004 0196877 310.3404 48.0643 15.47625567103002
-HIT-SAT (HO-59)
-1 29484U 06041F 07359.79289037 .00034341 30509-5 16856-3 0 9779
-2 29484 98.2585 80.7628 0149137 290.5862 67.9330 15.67962152 70924
+1 28897U 05043H 08261.13497747 .00000066 00000-0 23282-4 0 6524
+2 28897 98.0836 152.8415 0018019 120.7854 239.5130 14.59868830146187
+CUTE-1.7+APD (CO-56)
+1 28941U 06005C 08261.11557879 .00032347 27003-5 21545-3 0 3838
+2 28941 98.1179 24.7270 0152900 66.3288 295.3747 15.61321053144365
GENESAT-1
-1 29655U 06058C 07359.93279579 .00007118 00000-0 10425-3 0 3100
-2 29655 40.0310 295.7831 0003167 212.3276 147.7324 15.55690544 58210
-CSTB 1
-1 31122U 07012F 07359.77526379 .00000551 00000-0 13192-3 0 2194
-2 31122 98.0653 66.6621 0086462 150.2190 210.3927 14.55067607 36715
+1 29655U 06058C 08260.93338227 .00006186 00000-0 77925-4 0 5125
+2 29655 40.0258 88.0156 0003958 36.3502 323.7584 15.59902851 99713
+CSTB1
+1 31122U 07012F 08261.16645728 .00000552 00000-0 13192-3 0 4384
+2 31122 98.0353 323.3108 0086288 43.7946 317.0044 14.55158746 75450
MAST
-1 31126U 07012K 07359.23853933 .00000175 00000-0 50171-4 0 2155
-2 31126 98.0626 65.4750 0095330 153.5899 207.0196 14.53387932 36608
+1 31126U 07012K 08261.14710518 .00000050 00000-0 21920-4 0 4209
+2 31126 98.0316 321.8652 0095552 47.4340 313.4919 14.53444988 75379
LIBERTAD-1
-1 31128U 07012M 07359.70525800 -.00000047 00000-0 00000-0 0 2160
-2 31128 98.0636 65.3333 0103052 153.8002 206.8462 14.51897412 36618
+1 31128U 07012M 08260.64501595 -.00000046 00000-0 00000+0 0 4339
+2 31128 98.0312 320.1764 0103886 52.5256 308.5335 14.51974523 75206
POLYSAT CP3
-1 31129U 07012N 07359.82778504 .00000339 00000-0 89029-4 0 6153
-2 31129 98.0643 65.4753 0103211 153.5694 207.0794 14.51988223 36617
+1 31129U 07012N 08261.09602379 .00000044 00000-0 20785-4 0 2996
+2 31129 98.0320 320.6669 0103596 51.0434 309.9946 14.52063908 75250
CAPE1
-1 31130U 07012P 07359.90878720 .00000193 00000-0 55429-4 0 2000
-2 31130 98.0639 65.5323 0103556 153.1387 207.5208 14.51915647 36430
+1 31130U 07012P 08260.43204553 .00000175 00000-0 50987-4 0 4058
+2 31130 98.0335 319.9833 0103779 53.3250 307.7430 14.51991310 74963
POLYSAT CP4
-1 31132U 07012Q 07359.70473054 .00000175 00000-0 49047-4 0 2101
-2 31132 98.0659 66.5933 0086220 150.3523 210.2595 14.55072845 36574
+1 31132U 07012Q 08261.16557110 .00000417 00000-0 10225-3 0 4140
+2 31132 98.0352 323.2847 0086360 43.7719 317.0282 14.55143378 75323
+NTS (CANX-6)
+1 32784U 08021B 08260.21125203 .00000251 00000-0 39284-4 0 1571
+2 32784 97.9868 319.8080 0015561 190.9787 169.1087 14.80967775 20874
+CUTE-1.7+APD II
+1 32785U 08021C 08260.44123313 .00000111 00000-0 21042-4 0 1597
+2 32785 97.9855 320.0984 0014408 196.0722 164.0033 14.81392073 20917
+COMPASS-1
+1 32787U 08021E 08261.17878230 .00000110 00000-0 20849-4 0 1497
+2 32787 97.9817 320.7685 0015515 195.0252 165.0502 14.81459968 21021
+AAUSAT-II
+1 32788U 08021F 08261.16833290 .00000221 00000-0 34908-4 0 1500
+2 32788 97.9807 320.7760 0015116 195.2135 164.8625 14.81571825 21024
+DELFI-C3
+1 32789U 08021G 08260.23399854 .00000300 00000-0 45125-4 0 1580
+2 32789 97.9838 319.8785 0015435 197.4841 162.5840 14.81471690 20883
+CANX-2
+1 32790U 08021H 08261.18460925 -.00000052 00000-0 22791-6 0 1452
+2 32790 97.9855 320.8329 0015042 193.3783 166.7032 14.81381172 21003
+SEEDS II
+1 32791U 08021J 08260.71952068 -.00000062 00000-0 -96575-6 0 1458
+2 32791 97.9832 320.3299 0015656 194.5758 165.4999 14.81312966 20929
+PSLV DEB
+1 32797U 08021L 08259.11819499 .00001613 00000-0 20936-3 0 765
+2 32797 97.9886 318.9194 0016663 202.4292 157.6051 14.82055141 19405
Modified: trunk/data/galileo.tle
===================================================================
--- trunk/data/galileo.tle 2008-09-17 18:41:40 UTC (rev 122)
+++ trunk/data/galileo.tle 2008-09-17 18:43:42 UTC (rev 123)
@@ -1,3 +1,6 @@
GIOVE-A
-1 28922U 05051A 07358.57128647 .00000071 00000-0 10000-3 0 2969
-2 28922 56.0447 171.6037 0007431 340.2049 19.7642 1.70194522 12365
+1 28922U 05051A 08259.14832539 .00000016 00000-0 10000-3 0 3932
+2 28922 56.0556 164.6164 0007879 331.7703 28.2358 1.70194761 16882
+GIOVE-B
+1 32781U 08020A 08259.62465398 .00000013 00000-0 10000-3 0 683
+2 32781 55.9761 199.6087 0018608 214.7162 145.1291 1.70951143 2435
Modified: trunk/data/geo.tle
===================================================================
--- trunk/data/geo.tle 2008-09-17 18:41:40 UTC (rev 122)
+++ trunk/data/geo.tle 2008-09-17 18:43:42 UTC (rev 123)
@@ -1,1074 +1,1119 @@
LES 9
-1 08747U 76023B 07359.10473242 -.00000062 00000-0 10000-3 0 9411
-2 08747 10.5161 164.1674 0022700 300.6019 280.6782 1.00275251 62005
+1 08747U 76023B 08259.43832664 -.00000079 00000-0 10000-3 0 1245
+2 08747 10.6707 156.3591 0023538 313.7627 300.0208 1.00272734 64660
MARISAT 2
-1 09478U 76101A 07358.98203713 -.00000258 00000-0 10000-3 0 9203
-2 09478 13.5307 0.1036 0003714 300.1041 112.6101 1.00272586 57536
+1 09478U 76101A 08259.19172221 -.00000249 00000-0 10000-3 0 320
+2 09478 13.5890 358.2100 0002937 120.8401 270.6873 1.00275721 60196
+GOES 3
+1 10953U 78062A 08259.30616631 -.00000124 00000-0 10000-3 0 2390
+2 10953 14.2616 2.2707 0001272 257.6244 102.4005 1.00278049 63912
ESIAFI 1 (COMSTAR 4)
-1 12309U 81018A 07359.58665043 -.00000061 00000-0 10000-3 0 650
-2 12309 13.4754 14.4339 0006961 237.7283 122.2119 1.00273855 99781
+1 12309U 81018A 08258.83127835 -.00000141 00000-0 10000-3 0 1547
+2 12309 13.7046 12.4036 0006245 236.8702 123.1144 1.00282643102431
SATCOM C5
-1 13631U 82105A 07359.13476861 -.00000106 00000-0 10000-3 0 4212
-2 13631 11.6072 36.3447 0008640 215.5321 144.3946 1.00271961 58705
+1 13631U 82105A 08258.40502759 -.00000096 00000-0 10000-3 0 5340
+2 13631 12.0668 34.0473 0005751 202.8894 157.1619 1.00273181 61359
TDRS 1
-1 13969U 83026B 07358.31431029 -.00000301 00000-0 10000-3 0 5493
-2 13969 12.9124 13.2517 0026588 228.0970 275.4014 1.00275478 63573
-NATO 3D
-1 15391U 84115A 07359.66055530 -.00000075 00000-0 10000-3 0 6356
-2 15391 9.0077 47.2279 0094772 323.8623 35.4545 0.94954370 83807
-NAHUEL I1 (ANIK C1)
-1 15642U 85028B 07357.40263084 -.00000038 00000-0 10000-3 0 1875
-2 15642 9.0728 60.4290 0011653 309.3500 50.4418 0.99668692 88815
+1 13969U 83026B 08260.02942828 -.00000293 00000-0 10000-3 0 7120
+2 13969 13.1304 11.3502 0024183 222.6782 82.7353 1.00271977 66241
GSTAR 1
-1 15677U 85035A 07359.19062345 -.00000098 00000-0 10000-3 0 9588
-2 15677 9.4702 56.7597 0009383 226.9161 132.9369 1.00271795 57567
+1 15677U 85035A 08259.45710166 -.00000088 00000-0 10000-3 0 555
+2 15677 10.0731 53.8733 0006333 234.1161 125.9497 1.00272555 60226
INTELSAT 511
-1 15873U 85055A 07359.67612852 .00000010 00000-0 10000-3 0 2132
-2 15873 10.9535 44.3461 0014429 250.7993 109.0209 1.00076168 56984
+1 15873U 85055A 08259.40116051 -.00000115 00000-0 10000-3 0 3018
+2 15873 11.4803 41.8416 0010694 263.3682 96.5891 1.00080499 59639
GOES 7
-1 17561U 87022A 07359.24414828 .00000065 00000-0 10000-3 0 2444
-2 17561 11.0839 42.3880 0002860 196.5043 127.6730 1.00276667 59491
-OPTUS A3 (AUSSAT 3)
-1 18350U 87078A 07359.65553840 .00000141 00000-0 10000-3 0 1775
-2 18350 9.1982 55.6322 0006824 238.7079 66.8761 1.00272123 73751
+1 17561U 87022A 08260.44531600 .00000073 00000-0 10000-3 0 6056
+2 17561 11.5963 39.8791 0003495 170.5076 130.5061 1.00281416 62165
GSTAR 3
-1 19483U 88081A 07359.10502523 -.00000113 00000-0 10000-3 0 241
-2 19483 13.5999 25.8309 0004231 286.7880 73.1693 1.00272492 66940
+1 19483U 88081A 08259.37298382 -.00000100 00000-0 10000-3 0 1231
+2 19483 13.9592 23.5005 0002566 320.8814 39.1521 1.00272531 69609
TDRS 3
-1 19548U 88091B 07358.75107057 -.00000194 00000-0 10000-3 0 9986
-2 19548 10.7719 45.1303 0016924 275.8602 127.0315 1.00269162 57729
+1 19548U 88091B 08260.62199586 -.00000187 00000-0 10000-3 0 1202
+2 19548 11.3062 42.5987 0015371 304.4956 317.7228 1.00273963 60394
ASTRA 1A
-1 19688U 88109B 07357.47424554 -.00000205 00000-0 10000-3 0 3676
-2 19688 6.2591 70.7259 0013778 277.7199 81.9133 0.98338922 49726
+1 19688U 88109B 08258.89320655 -.00000090 00000-0 10000-3 0 4774
+2 19688 6.9306 67.5961 0011254 303.2624 56.8591 0.98337162 52342
TDRS 4
-1 19883U 89021B 07359.18424797 -.00000283 00000-0 10000-3 0 2637
-2 19883 9.2866 57.8419 0003042 218.2742 197.5719 1.00278056241309
+1 19883U 89021B 08260.88077882 -.00000274 00000-0 10000-3 0 4244
+2 19883 9.8925 54.8886 0002931 108.6307 103.9915 1.00272369243976
INTELSAT 602 (IS-602)
-1 20315U 89087A 07359.29892992 -.00000141 00000-0 10000-3 0 6490
-2 20315 5.5681 72.9130 0001701 189.5956 95.5312 1.00270640 64300
+1 20315U 89087A 08260.43817925 -.00000058 00000-0 10000-3 0 7534
+2 20315 6.2315 69.5979 0001708 110.7206 137.3982 1.00325690 66975
LEASAT 5
-1 20410U 90002B 07359.68778748 -.00000315 00000-0 10000-3 0 8383
-2 20410 7.3585 37.7530 0000697 273.5535 130.1363 1.00269725 51032
+1 20410U 90002B 08259.58887110 -.00000308 00000-0 10000-3 0 9761
+2 20410 7.8273 36.7338 0000642 245.2906 24.9511 1.00272133 53689
INTELSAT 603 (IS-603)
-1 20523U 90021A 07359.16443544 -.00000156 00000-0 10000-3 0 2023
-2 20523 5.0406 74.5373 0002440 198.2436 219.7524 1.00270448 58066
+1 20523U 90021A 08260.94778440 -.00000151 00000-0 10000-3 0 3472
+2 20523 5.7063 71.1584 0001493 106.5437 139.8519 1.00272737 60735
ASIASAT 1
-1 20558U 90030A 07358.83381176 .00000035 00000-0 10000-3 0 4977
-2 20558 7.7372 66.7567 0006491 179.0163 180.8405 0.99243154 64713
+1 20558U 90030A 08258.82506860 -.00000290 00000-0 10000-3 0 6049
+2 20558 8.3876 63.6089 0004210 170.3859 189.8091 0.99245600 67347
INSAT-1D
-1 20643U 90051A 07358.69075658 -.00000152 00000-0 10000-3 0 6944
-2 20643 8.5269 62.6018 0009123 35.3134 324.6350 1.00267541 51076
+1 20643U 90051A 08258.98816869 -.00000034 00000-0 10000-3 0 9811
+2 20643 9.1558 59.5236 0015685 39.5752 320.6955 1.00264015 53738
COSMOS 2085
-1 20693U 90061A 07359.65699701 -.00000059 00000-0 10000-3 0 7653
-2 20693 11.1414 40.7092 0005936 209.7030 150.2418 1.00269079 63835
+1 20693U 90061A 08258.90926882 -.00000113 00000-0 10000-3 0 8565
+2 20693 11.6367 38.3343 0002516 205.2819 154.7880 1.00283290 66483
SKYNET 4C
-1 20776U 90079A 07355.08057203 .00000044 00000-0 10000-3 0 7307
-2 20776 8.6744 52.4909 0002830 199.0519 233.1086 1.00276081 63231
+1 20776U 90079A 08260.64542844 .00000038 00000-0 10000-3 0 8321
+2 20776 9.2613 49.9848 0002185 130.9650 53.4024 1.00274927 65941
EUTELSAT 2-F1
-1 20777U 90079B 07359.59533260 -.00000253 00000-0 10000-3 0 6920
-2 20777 7.9376 65.7660 0006884 157.0556 202.8564 0.99346396 43724
+1 20777U 90079B 08260.31898233 -.00000241 00000-0 10000-3 0 7924
+2 20777 8.5881 62.6337 0006489 125.7307 234.4946 0.99347881 46364
SBS-6
-1 20872U 90091A 07359.18488466 -.00000250 00000-0 10000-3 0 7997
-2 20872 0.4312 88.4076 0002062 183.1138 174.4014 1.00270793 51386
+1 20872U 90091A 08261.10224266 -.00000224 00000-0 10000-3 0 9430
+2 20872 1.1047 82.7357 0002158 91.8768 137.7229 1.00272837 54056
GALAXY 6
-1 20873U 90091B 07359.38426094 .00000096 00000-0 10000-3 0 786
-2 20873 4.8202 75.4285 0002796 121.8853 237.8810 0.99763785 57466
+1 20873U 90091B 08260.00092618 .00000003 00000-0 10000-3 0 1844
+2 20873 5.4905 72.0615 0003511 81.5976 278.7319 0.99754657 60119
INMARSAT 2-F1
-1 20918U 90093A 07358.58012499 -.00000259 00000-0 10000-3 0 7025
-2 20918 5.3602 59.2343 0002951 212.0541 173.7604 1.00268989 59258
+1 20918U 90093A 08257.98984230 -.00000255 00000-0 10000-3 0 433
+2 20918 5.9718 57.4935 0002756 110.5808 325.1340 1.00272633 61906
GSTAR 4
-1 20946U 90100B 07359.42357819 -.00000089 00000-0 10000-3 0 953
-2 20946 5.0049 75.2240 0006881 169.0635 190.7000 0.99145043 57389
-NATO 4A
-1 21047U 91001A 07358.37270606 -.00000179 00000-0 10000-3 0 5481
-2 21047 7.9353 48.2737 0007321 120.9558 239.0320 0.98285519 61819
+1 20946U 90100B 08258.67585675 -.00000046 00000-0 10000-3 0 1945
+2 20946 5.6767 71.8953 0005557 145.7275 214.6015 0.99144604 60002
COSMOS 2133
-1 21111U 91010A 07358.65229669 -.00000140 00000-0 10000-3 0 9737
-2 21111 10.1650 47.0395 0003996 248.4024 111.5078 1.00264252 61765
+1 21111U 91010A 08258.94621204 -.00000041 00000-0 10000-3 0 629
+2 21111 10.7105 44.5588 0002001 310.6387 49.4445 1.00269326 64422
INMARSAT 2-F2
-1 21149U 91018A 07359.26710631 -.00000137 00000-0 10000-3 0 8104
-2 21149 4.6787 58.7417 0004555 212.7183 180.0210 1.00271229 61559
+1 21149U 91018A 08260.45692399 -.00000134 00000-0 10000-3 0 1747
+2 21149 5.2924 57.4037 0003855 110.1355 254.7773 1.00272432 64224
TDRS 5
-1 21639U 91054B 07359.22672325 .00000089 00000-0 10000-3 0 1266
-2 21639 8.5930 61.8968 0003105 207.0592 94.4896 1.00272321 60048
+1 21639U 91054B 08260.61373433 .00000100 00000-0 10000-3 0 2972
+2 21639 9.2197 58.8112 0003398 111.8536 235.1125 1.00280239 62714
INTELSAT 605 (IS-605)
-1 21653U 91055A 07359.46442700 .00000009 00000-0 10000-3 0 5627
-2 21653 3.0689 79.4352 0001810 196.9303 158.3803 1.00271751 59899
+1 21653U 91055A 08260.28904425 .00000013 00000-0 10000-3 0 6701
+2 21653 3.7405 76.0051 0001111 92.6442 105.0228 1.00273520 62565
ANIK E1
-1 21726U 91067A 07358.04883183 -.00000245 00000-0 10000-3 0 9535
-2 21726 4.3908 77.6300 0007542 160.1877 199.5100 0.99171929 50338
+1 21726U 91067A 08259.24602825 -.00000197 00000-0 10000-3 0 559
+2 21726 5.0696 74.1329 0005411 157.1243 203.2236 0.99172789 52979
INTELSAT 601 (IS-601)
-1 21765U 91075A 07356.59997139 .00000134 00000-0 00000-0 0 5316
-2 21765 3.1127 79.1979 0000941 221.7968 53.2626 1.00272897 58977
+1 21765U 91075A 08259.92492116 .00000128 00000-0 10000-3 0 6397
+2 21765 3.7920 75.7550 0000280 325.5424 334.4428 1.00274857 61669
EUTELSAT 2-F3
-1 21803U 91083A 07359.53995591 -.00000313 00000-0 10000-3 0 4307
-2 21803 7.0916 69.0032 0005182 184.0953 175.6267 0.99299118 54646
+1 21803U 91083A 08260.29231377 -.00000140 00000-0 10000-3 0 5766
+2 21803 7.7488 65.7726 0003766 140.7112 182.0763 0.99295906 57289
GALAXY 5
-1 21906U 92013A 07356.79054472 .00000104 00000-0 10000-3 0 7034
-2 21906 2.8475 80.5103 0013268 253.4283 105.8835 0.99284848 49375
+1 21906U 92013A 08258.67749282 .00000006 00000-0 10000-3 0 8091
+2 21906 3.5337 77.0394 0012207 270.0163 90.3122 0.99289993 52026
INMARSAT 2-F4
-1 21940U 92021B 07359.75345435 -.00000352 00000-0 10000-3 0 5137
-2 21940 3.3928 48.7481 0002610 222.7491 202.6222 1.00269435 57447
+1 21940U 92021B 08259.88346334 -.00000348 00000-0 10000-3 0 8767
+2 21940 3.9494 50.0606 0002065 124.2557 247.9716 1.00274816 60105
EUTELSAT 2-F4
-1 22028U 92041B 07358.05399568 -.00000235 00000-0 10000-3 0 9779
-2 22028 6.2650 72.4377 0007034 115.0355 244.8212 0.99080591 49354
-OPTUS B1 (AUSSAT B1)
-1 22087U 92054A 07356.46376744 -.00000064 00000-0 10000-3 0 8603
-2 22087 1.4332 83.1913 0005892 175.3512 163.0436 1.00271971 67708
+1 22028U 92041B 08259.49515132 .00000034 00000-0 10000-3 0 794
+2 22028 6.9349 69.0897 0007507 104.2250 256.0918 0.99076611 51993
SATCOM C3
-1 22117U 92060B 07357.11262876 -.00000226 00000-0 10000-3 0 8348
-2 22117 3.0182 79.3444 0001185 228.5257 104.8520 1.00268999 55932
+1 22117U 92060B 08260.43375122 -.00000231 00000-0 10000-3 0 9859
+2 22117 3.6969 75.9109 0002255 146.4985 210.4765 1.00271513 58626
HELLAS SAT 1 (DFS 3)
-1 22175U 92066A 07359.43257382 -.00000023 00000-0 10000-3 0 1765
-2 22175 5.5614 73.1840 0004638 204.0004 155.7652 0.99736330 53294
+1 22175U 92066A 08259.13230129 .00000090 00000-0 10000-3 0 2766
+2 22175 6.2260 69.8858 0001236 263.9066 96.3567 0.99731046 55930
GORIZONT 27
-1 22245U 92082A 07358.00879799 -.00000286 00000-0 10000-3 0 2947
-2 22245 10.1235 50.3883 0016828 205.1964 154.6615 1.00186510 59529
+1 22245U 92082A 08259.57499161 .00000127 00000-0 10000-3 0 3732
+2 22245 10.6931 47.7300 0015061 208.9893 151.0316 1.00177379 62190
SUPERBIRD A1
-1 22253U 92084A 07359.30249499 -.00000128 00000-0 10000-3 0 5533
-2 22253 2.1302 81.0666 0004855 190.0059 89.2575 1.00271111 54871
+1 22253U 92084A 08260.44180439 -.00000126 00000-0 10000-3 0 7213
+2 22253 2.8039 77.7229 0004292 82.3137 152.7544 1.00272040 57548
COSMOS 2224
-1 22269U 92088A 07359.61038880 -.00000292 00000-0 10000-3 0 4247
-2 22269 9.2355 53.0487 0003053 140.0443 219.9179 1.00163729 54502
+1 22269U 92088A 08259.12739448 .00000059 00000-0 10000-3 0 5129
+2 22269 9.8172 50.4474 0003891 114.3315 245.8329 1.00227665 57153
TDRS 6
-1 22314U 93003B 07359.30336995 .00000080 00000-0 10000-3 0 2297
-2 22314 7.9166 65.1681 0003682 193.0037 130.6608 1.00267765 54762
+1 22314U 93003B 08260.41903837 .00000088 00000-0 10000-3 0 3453
+2 22314 8.5564 61.9721 0003232 83.8757 187.0328 1.00266987 57433
ASTRA 1C
-1 22653U 93031A 07359.13205527 .00000037 00000-0 00000-0 0 2097
-2 22653 1.2156 85.8407 0003590 179.9479 240.1233 1.00272242 48647
+1 22653U 93031A 08257.55795380 .00000034 00000-0 10000-3 0 3061
+2 22653 1.8888 81.7230 0003465 90.6332 26.6819 1.00270313 51280
INSAT-2B
-1 22724U 93048B 07357.98683577 -.00000180 00000-0 10000-3 0 227
-2 22724 6.5922 70.2154 0011845 39.6524 320.2444 0.99981887 53107
+1 22724U 93048B 08258.05148126 .00000116 00000-0 10000-3 0 1311
+2 22724 7.2475 66.9437 0015042 44.1805 316.1592 0.99960950 55759
ACTS
-1 22796U 93058B 07359.21007789 -.00000097 00000-0 10000-3 0 4658
-2 22796 8.1450 64.2040 0002135 208.4020 151.4768 1.00271682 59237
-RADUGA 30
-1 22836U 93062A 07358.67045382 -.00000140 00000-0 10000-3 0 5108
-2 22836 9.6522 53.7988 0005739 166.3725 193.5763 1.00262919 52103
+1 22796U 93058B 08259.47806511 -.00000084 00000-0 10000-3 0 5596
+2 22796 8.7801 61.0811 0001232 67.3034 292.8722 1.00271630 61896
INTELSAT 701 (IS-701)
-1 22871U 93066A 07359.45967105 .00000055 00000-0 10000-3 0 1632
-2 22871 0.0043 287.5170 0003414 345.4142 166.1363 1.00271733 51796
+1 22871U 93066A 08260.41934850 .00000054 00000-0 10000-3 0 2642
+2 22871 0.0348 147.4903 0002901 23.8534 155.3685 1.00273415 54456
GORIZONT 28
-1 22880U 93069A 07359.77211847 -.00000370 00000-0 10000-3 0 7698
-2 22880 9.6141 53.8518 0001817 259.7187 174.9325 1.00272037 51862
+1 22880U 93069A 08260.35594862 -.00000359 00000-0 10000-3 0 9706
+2 22880 10.1985 51.0892 0000667 252.5721 297.1806 1.00276175 54522
GORIZONT 29
-1 22907U 93072A 07358.81801991 .00000121 00000-0 10000-3 0 5108
-2 22907 9.5797 53.9697 0015105 185.3975 174.5167 1.00139500 51611
+1 22907U 93072A 08259.41668198 -.00000140 00000-0 10000-3 0 5781
+2 22907 10.1690 51.2253 0014951 194.0716 166.0034 1.00115944 54278
SOLIDARIDAD 1
-1 22911U 93073A 07359.23795029 -.00000068 00000-0 10000-3 0 88
-2 22911 6.5784 70.2046 0004034 133.9545 225.9093 1.00269553 50249
-METEOSAT-6
-1 22912U 93073B 07357.62464233 -.00000017 00000-0 10000-3 0 3098
-2 22912 7.0739 66.1732 0002604 226.3112 91.5041 1.00274438 50035
+1 22911U 93073A 08258.49671785 -.00000086 00000-0 10000-3 0 975
+2 22911 7.2320 66.9360 0004692 111.8377 248.4326 1.00279733 52895
+METEOSAT-6 (MOP-3)
+1 22912U 93073B 08259.73905332 -.00000013 00000-0 10000-3 0 6912
+2 22912 7.7164 63.0794 0000587 177.0624 88.3976 1.00269750 52715
NATO 4B
-1 22921U 93076A 07357.80424577 .00000150 00000-0 10000-3 0 9574
-2 22921 6.5502 57.2096 0003485 216.4771 143.3486 1.00275324 51462
+1 22921U 93076A 08260.06911185 .00000153 00000-0 10000-3 0 677
+2 22921 7.1582 55.0660 0003357 132.7406 227.4595 1.00272499 54146
DIRECTV 1 (DBS 1)
-1 22930U 93078A 07357.25825841 -.00000164 00000-0 10000-3 0 3451
-2 22930 0.0210 39.4239 0002079 227.5568 186.2605 1.00270529 59181
+1 22930U 93078A 08259.27812102 -.00000173 00000-0 10000-3 0 4766
+2 22930 0.0601 58.1834 0001399 115.9945 189.3597 1.00270093 61865
THAICOM 1
-1 22931U 93078B 07358.58901973 -.00000358 00000-0 10000-3 0 700
-2 22931 0.0943 51.2748 0002101 211.9713 161.5509 1.00269450 50908
+1 22931U 93078B 08259.81035860 -.00000361 00000-0 10000-3 0 2267
+2 22931 0.0752 35.5681 0001467 197.2725 174.0891 1.00273645 53570
GOES 8
-1 23051U 94022A 07359.67261175 -.00000100 00000-0 10000-3 0 1366
-2 23051 4.3659 81.5678 0009185 153.2907 206.4402 0.98904204 57382
+1 23051U 94022A 08259.55751629 .00000064 00000-0 10000-3 0 4801
+2 23051 5.0483 77.5837 0008013 149.6336 210.7506 0.98903677 60000
INTELSAT 702 (IS-702)
-1 23124U 94034A 07359.69148204 .00000088 00000-0 10000-3 0 9585
-2 23124 0.0033 331.2776 0003021 305.3801 120.9212 1.00271790 63716
+1 23124U 94034A 08255.79424336 .00000082 00000-0 10000-3 0 861
+2 23124 0.0117 265.6156 0002632 255.5989 170.7506 1.00273379 66325
INTELSAT 2 (IS-2)
-1 23175U 94040A 07358.58774579 -.00000026 00000-0 10000-3 0 1726
-2 23175 0.0292 35.9984 0001439 213.3359 224.0183 1.00272949 48617
+1 23175U 94040A 08260.43209218 -.00000029 00000-0 10000-3 0 2810
+2 23175 0.0112 204.6165 0002117 318.9063 156.8173 1.00273671 51283
BS-3N
-1 23176U 94040B 07359.58829010 -.00000348 00000-0 10000-3 0 8060
-2 23176 0.0201 319.3285 0002092 27.7475 68.2997 1.00269305 49123
+1 23176U 94040B 08259.80823368 -.00000350 00000-0 10000-3 0 9182
+2 23176 0.0838 277.5738 0001943 244.0522 234.4203 1.00270813 51786
APSTAR 1
-1 23185U 94043A 07359.54015615 -.00000267 00000-0 10000-3 0 7998
-2 23185 3.0945 79.4591 0001945 196.2814 154.3978 1.00267941 49164
+1 23185U 94043A 08260.33431771 -.00000263 00000-0 10000-3 0 36
+2 23185 3.7483 75.8523 0000771 111.9519 70.2393 1.00270695 51839
DIRECTV 2 (DBS 2)
-1 23192U 94047A 07358.99294847 -.00000190 00000-0 10000-3 0 2231
-2 23192 0.9975 84.6989 0016328 172.8891 187.3886 0.98636353 59108
+1 23192U 94047A 08260.49171486 .00000016 00000-0 10000-3 0 3408
+2 23192 1.6851 81.0761 0013103 159.8908 155.8978 0.98634677 61720
BRASILSAT B1
-1 23199U 94049A 07356.45059123 -.00000237 00000-0 10000-3 0 190
-2 23199 0.7921 86.9756 0004849 184.2682 266.5313 1.00267954 59837
+1 23199U 94049A 08259.45690978 -.00000269 00000-0 10000-3 0 1435
+2 23199 1.4604 82.2432 0006424 347.9512 20.9520 1.00269166 62523
OPTUS B3
-1 23227U 94055A 07358.64278546 -.00000180 00000-0 10000-3 0 900
-2 23227 0.0795 91.8500 0003612 175.3134 208.9395 1.00269307 48789
+1 23227U 94055A 08259.64429284 -.00000073 00000-0 10000-3 0 2158
+2 23227 0.7518 83.4562 0006032 105.1750 202.2981 1.00273105 51455
NSS-703
-1 23305U 94064A 07358.71188319 .00000075 00000-0 10000-3 0 7025
-2 23305 0.0259 153.0823 0002670 123.9331 129.1167 1.00273020 48510
+1 23305U 94064A 08260.70111815 .00000072 00000-0 10000-3 0 8235
+2 23305 0.0170 182.4229 0002908 348.9150 134.0986 1.00273722 51180
SOLIDARIDAD 2
-1 23313U 94065A 07357.49288037 -.00000017 00000-0 10000-3 0 397
-2 23313 0.0139 328.1829 0002239 293.9298 252.0652 1.00271704 48363
+1 23313U 94065A 08259.40530911 -.00000025 00000-0 10000-3 0 1885
+2 23313 0.5394 84.0996 0002309 78.3378 223.3321 1.00273541 51040
THAICOM 2
-1 23314U 94065B 07358.63525300 -.00000117 00000-0 10000-3 0 9572
-2 23314 0.0682 33.3263 0007323 233.7590 132.8812 1.00270412 48357
+1 23314U 94065B 08260.60291556 -.00000120 00000-0 10000-3 0 1144
+2 23314 0.0798 36.7264 0004516 195.9850 58.7634 1.00271723 51024
EXPRESS 1
-1 23319U 94067A 07358.96142407 -.00000155 00000-0 10000-3 0 4913
-2 23319 6.7764 69.4631 0004069 107.2773 252.5847 0.99833294 48221
+1 23319U 94067A 08260.41054417 -.00000186 00000-0 10000-3 0 5969
+2 23319 7.4366 66.2159 0005039 90.8413 269.4175 0.99821971 50888
ASTRA 1D
-1 23331U 94070A 07355.00000000 .00000171 00000-0 00000-0 0 6415
-2 23331 0.2720 75.4290 0003098 190.2200 214.5350 1.00270738 48589
-TELSTAR 11 (ORION 1)
-1 23413U 94079A 07348.18930110 -.00000232 00000-0 10000-3 0 6031
-2 23413 3.4047 78.4932 0004745 177.5207 217.0214 1.00269422 47357
+1 23331U 94070A 08260.02195259 .00000156 00000-0 00000+0 0 7912
+2 23331 0.9578 80.7100 0002691 82.2008 231.6329 1.00270168 51295
RADUGA 32
-1 23448U 94087A 07358.68354288 -.00000137 00000-0 10000-3 0 9622
-2 23448 8.9975 58.3371 0006742 136.2152 223.7487 1.00266646 65260
+1 23448U 94087A 08258.97470200 -.00000043 00000-0 10000-3 0 578
+2 23448 9.6077 55.4503 0006219 123.9304 236.2660 1.00267522 67928
INTELSAT 704 (IS-704)
-1 23461U 95001A 07354.67089031 .00000016 00000-0 10000-3 0 6655
-2 23461 0.0417 96.0315 0005227 161.4820 138.8995 1.00272360 47445
+1 23461U 95001A 08259.91351580 -.00000002 00000-0 10000-3 0 8016
+2 23461 0.0175 226.0163 0003792 283.7632 240.3407 1.00273409 50150
INTELSAT 705 (IS-705)
-1 23528U 95013A 07355.07079230 -.00000265 00000-0 10000-3 0 6924
-2 23528 0.0105 27.7217 0002765 237.3550 159.6818 1.00270241 46622
+1 23528U 95013A 08258.99967436 -.00000283 00000-0 10000-3 0 7697
+2 23528 0.0087 122.6682 0003758 45.8590 135.6950 1.00270696 49315
BRASILSAT B2
-1 23536U 95016A 07359.41814985 -.00000274 00000-0 10000-3 0 7372
-2 23536 0.0621 194.8795 0002020 104.2601 239.9288 1.00270675 46730
+1 23536U 95016A 08259.45789964 -.00000168 00000-0 00000-0 0 8856
+2 23536 0.6407 87.6814 0003807 68.5101 271.4422 1.00272792 49398
AMSC 1
-1 23553U 95019A 07357.51145311 -.00000110 00000-0 10000-3 0 9633
-2 23553 3.1458 79.4197 0002670 193.2523 262.1506 1.00270794 46527
+1 23553U 95019A 08261.14872411 -.00000110 00000-0 10000-3 0 399
+2 23553 3.8246 75.9177 0002557 116.1728 116.6236 1.00272260 49215
INTELSAT 706 (IS-706)
-1 23571U 95023A 07359.64054471 .00000115 00000-0 10000-3 0 6989
-2 23571 0.0177 26.6645 0003076 241.6201 106.3191 1.00272715 46169
+1 23571U 95023A 08260.68955530 .00000114 00000-0 10000-3 0 8027
+2 23571 0.0328 131.8611 0003094 47.3713 115.2749 1.00274129 48822
DIRECTV 3 (DBS 3)
-1 23598U 95029A 07359.39880509 -.00000217 00000-0 10000-3 0 8048
-2 23598 0.0117 329.1682 0002158 326.4378 219.4870 1.00269341 45880
+1 23598U 95029A 08259.31640029 -.00000220 00000-0 10000-3 0 9349
+2 23598 0.0094 313.7608 0001565 235.3975 197.3833 1.00271681 48542
TDRS 7
-1 23613U 95035B 07359.44515647 .00000118 00000-0 10000-3 0 2501
-2 23613 9.8494 53.9882 0003930 232.1802 176.8779 1.00270810 45585
+1 23613U 95035B 08260.25210392 .00000127 00000-0 10000-3 0 3771
+2 23613 10.4411 51.1620 0002779 130.2888 114.5397 1.00283823 48243
INTELSAT 4 (IS-4)
-1 23636U 95040A 07358.69168088 -.00000054 00000-0 10000-3 0 7416
-2 23636 0.0199 190.1168 0003644 62.7504 160.9870 1.00272646 45354
+1 23636U 95040A 08260.71596964 -.00000057 00000-0 10000-3 0 8504
+2 23636 0.0058 202.5870 0003088 323.6529 159.5572 1.00272988 48023
COSMOS 2319
-1 23653U 95045A 07359.07864798 -.00000286 00000-0 10000-3 0 8456
-2 23653 8.5955 60.7296 0003166 85.5444 274.3982 1.00186300 45114
+1 23653U 95045A 08259.61166125 .00000131 00000-0 10000-3 0 9296
+2 23653 9.2195 57.7639 0005127 83.7600 276.4430 1.00202326 47770
TELSTAR 4 (TELSTAR 402R)
-1 23670U 95049A 07358.26413231 -.00000053 00000-0 10000-3 0 7553
-2 23670 3.9905 76.7887 0006388 172.0097 187.6450 1.00299961 44860
+1 23670U 95049A 08258.47010840 -.00000183 00000-0 10000-3 0 8370
+2 23670 4.6582 73.4550 0004758 147.6933 212.6870 1.00277146 47528
LUCH 1
-1 23680U 95054A 07359.72948082 -.00000080 00000-0 10000-3 0 5681
-2 23680 7.6514 70.4757 0004565 273.5049 86.3091 1.00266711 44733
+1 23680U 95054A 08258.99660590 -.00000076 00000-0 10000-3 0 6691
+2 23680 8.3040 66.9854 0004429 311.3190 48.8331 1.00277590 47381
ASTRA 1E
-1 23686U 95055A 07358.66268304 .00000141 00000-0 00000-0 0 7979
-2 23686 0.0716 157.3172 0002654 84.1668 113.3558 1.00271604 44686
+1 23686U 95055A 08259.70410637 .00000138 00000-0 00000+0 0 9071
+2 23686 0.0636 190.0197 0004662 323.0046 118.9846 1.00273487 47353
ASIASAT 2
-1 23723U 95064A 07358.97624164 -.00000304 00000-0 10000-3 0 5362
-2 23723 0.0109 309.9724 0002186 319.5977 275.4913 1.00268550 44221
+1 23723U 95064A 08259.55216542 -.00000308 00000-0 10000-3 0 7506
+2 23723 0.0478 302.6490 0002474 222.4106 129.1247 1.00273631 46881
TELECOM 2C
-1 23730U 95067A 07358.18461128 .00000021 00000-0 10000-3 0 9016
-2 23730 3.8203 77.6202 0005432 190.6356 253.5537 1.00270562 44248
+1 23730U 95067A 08259.83490127 .00000022 00000-0 10000-3 0 56
+2 23730 4.4866 74.2371 0004225 100.9212 123.6208 1.00272414 46910
ECHOSTAR 1
-1 23754U 95073A 07359.55316993 .00000132 00000-0 10000-3 0 8573
-2 23754 0.0176 344.5858 0001604 267.3496 252.8198 1.00274262 43772
+1 23754U 95073A 08259.50027778 .00000130 00000-0 10000-3 0 9768
+2 23754 0.0277 266.8222 0002526 250.9278 229.1295 1.00275299 46437
INTELSAT 3R (IS-3R)
-1 23764U 96002A 07359.04491310 -.00000266 00000-0 00000-0 0 4568
-2 23764 0.0275 116.4579 0001592 134.5503 175.2468 1.00266685 43777
-MEASAT 1
-1 23765U 96002B 07358.96695988 .00000144 00000-0 10000-3 0 5756
-2 23765 0.2248 107.0078 0003181 73.2241 294.5755 0.99976643 43755
+1 23764U 96002A 08260.20832189 -.00000268 00000-0 10000-3 0 5524
+2 23764 0.0129 207.7709 0002532 351.5034 188.2546 1.00271173 46445
+AFRICASAT-1 (MEASAT-1)
+1 23765U 96002B 08258.67274744 .00000132 00000-0 10000-3 0 7026
+2 23765 0.9159 82.6550 0000533 27.9212 171.6671 1.00275989 46403
KOREASAT 2
-1 23768U 96003A 07355.79279117 -.00000348 00000-0 10000-3 0 5173
-2 23768 0.9809 84.6888 0001925 237.1981 169.8319 1.00267783 43709
-ANATOLIA 1 (PALAPA C1)
-1 23779U 96006A 07354.76833975 .00000171 00000-0 10000-3 0 9168
-2 23779 0.0261 244.1034 0011064 91.5834 67.8246 1.00275632 43476
+1 23768U 96003A 08257.78775251 -.00000363 00000-0 10000-3 0 6284
+2 23768 1.6599 80.9593 0004248 24.5931 287.7523 1.00274548 46379
+HGS-3
+1 23779U 96006A 08260.05344853 .00000154 00000-0 10000-3 0 756
+2 23779 0.0304 228.5001 0002527 293.3769 250.7806 1.00275784 46181
INTELSAT 707 (IS-707)
-1 23816U 96015A 07358.18489567 -.00000279 00000-0 10000-3 0 6532
-2 23816 0.0081 5.8170 0003434 267.3755 192.6693 1.00268297 43155
+1 23816U 96015A 08259.30917112 -.00000285 00000-0 10000-3 0 7571
+2 23816 0.0031 167.8842 0003269 22.0530 223.0120 1.00271518 45828
INMARSAT 3-F1
-1 23839U 96020A 07359.68277909 .00000014 00000-0 10000-3 0 208
-2 23839 0.0716 342.6060 0005606 292.7580 128.7367 1.00269741 42967
+1 23839U 96020A 08258.59829400 .00000010 00000-0 10000-3 0 3777
+2 23839 0.1316 297.4043 0004797 227.6735 108.7641 1.00274032 45607
ASTRA 1F
-1 23842U 96021A 07358.67368610 .00000124 00000-0 00000-0 0 8320
-2 23842 0.0110 239.7899 0006214 89.0061 25.7357 1.00274441 42858
+1 23842U 96021A 08255.90665278 .00000117 00000-0 00000+0 0 9280
+2 23842 0.0319 178.3836 0001829 259.3368 259.1900 1.00275698 45481
MSAT M1
-1 23846U 96022A 07359.09642916 -.00000076 00000-0 10000-3 0 1319
-2 23846 0.4910 85.0067 0005876 184.1518 112.2808 1.00271135 42782
+1 23846U 96022A 08260.49394751 -.00000078 00000-0 10000-3 0 3129
+2 23846 1.1653 81.5393 0005242 85.3052 260.2924 1.00272115 45447
PALAPA C2
-1 23864U 96030A 07357.60322462 -.00000351 00000-0 10000-3 0 6258
-2 23864 0.0303 343.0861 0001408 290.1788 148.6072 1.00272541 42493
+1 23864U 96030A 08260.60119760 -.00000357 00000-0 10000-3 0 7478
+2 23864 0.0127 302.6051 0001407 254.0111 128.7184 1.00273311 45174
AMOS
-1 23865U 96030B 07358.96248269 -.00000031 00000-0 10000-3 0 8786
-2 23865 0.0207 243.9533 0003736 5.7817 185.8684 1.00271521 42501
+1 23865U 96030B 08258.82659323 -.00000034 00000-0 00000+0 0 9776
+2 23865 0.0504 155.4785 0000848 74.9877 57.2955 1.00273650 45154
GALAXY 9 (G-9)
-1 23877U 96033A 07358.47684814 -.00000220 00000-0 00000-0 0 8694
-2 23877 0.0089 356.8875 0002656 297.1285 249.2587 1.00269155 42441
+1 23877U 96033A 08259.45688012 -.00000225 00000-0 10000-3 0 9608
+2 23877 0.0739 79.4941 0002099 93.6963 265.1002 1.00272420 45113
GORIZONT 32
-1 23880U 96034A 07359.27819622 -.00000120 00000-0 10000-3 0 8294
-2 23880 8.1624 62.6822 0004542 196.9483 279.7508 1.00270986 42428
+1 23880U 96034A 08260.90401714 -.00000114 00000-0 10000-3 0 346
+2 23880 8.7905 59.6393 0002178 146.9784 100.5640 1.00275186 45098
INTELSAT 709 (IS-709)
-1 23915U 96035A 07358.67143411 -.00000181 00000-0 10000-3 0 6940
-2 23915 0.0112 294.5133 0003023 329.5773 155.5823 1.00270335 42249
+1 23915U 96035A 08258.92313337 -.00000186 00000-0 10000-3 0 8109
+2 23915 0.0060 138.1516 0002935 38.8382 234.7699 1.00272532 44903
APSTAR 1A
-1 23943U 96039A 07359.78663382 -.00000337 00000-0 10000-3 0 6406
-2 23943 2.3912 80.9197 0001658 184.8170 241.3802 1.00273272 42069
+1 23943U 96039A 08259.72166789 -.00000335 00000-0 10000-3 0 8476
+2 23943 3.0427 77.3587 0001204 78.7144 228.7432 1.00267519 44719
TURKSAT 1C
-1 23949U 96040B 07358.59732005 .00000149 00000-0 10000-3 0 7547
-2 23949 0.0582 141.5553 0001331 49.9808 158.7453 1.00273828 41979
+1 23949U 96040B 08260.02195259 .00000155 00000-0 10000-3 0 8742
+2 23949 0.4696 80.3973 0003493 103.0472 210.7699 1.00271988 44659
TELECOM 2D
-1 24209U 96044B 07357.96557286 -.00000059 00000-0 10000-3 0 6783
-2 24209 1.5295 82.7763 0005853 177.6474 171.4210 1.00272467 41786
+1 24209U 96044B 08260.13327358 -.00000062 00000-0 10000-3 0 7843
+2 24209 2.2087 79.2898 0005047 90.5287 225.7607 1.00272278 44464
INMARSAT 3-F2
-1 24307U 96053A 07357.97012947 -.00000116 00000-0 10000-3 0 1153
-2 24307 0.0940 308.8803 0005827 321.9313 155.0701 1.00271462 41361
+1 24307U 96053A 08260.15821345 -.00000122 00000-0 10000-3 0 4809
+2 24307 0.1359 293.4130 0005577 227.3787 236.1678 1.00272480 44047
ECHOSTAR 2
-1 24313U 96055A 07357.54647307 .00000137 00000-0 10000-3 0 6785
-2 24313 0.0199 339.8744 0002173 313.7968 206.8213 1.00273044 41381
+1 24313U 96055A 08259.50210867 .00000119 00000-0 10000-3 0 8232
+2 24313 0.1812 82.4295 0002948 98.4494 210.7827 1.00303790 44062
AMC-1 (GE-1)
-1 24315U 96054A 07358.53832593 -.00000097 00000-0 10000-3 0 8899
-2 24315 0.0257 213.4923 0003440 44.7184 285.2675 1.00271305 41351
-ARABSAT 2B
-1 24652U 96063A 07358.76487002 .00000157 00000-0 00000-0 0 6899
-2 24652 0.1543 246.6704 0003607 12.5006 139.5230 1.00272577 41192
-MEASAT 2
-1 24653U 96063B 07359.53498236 -.00000216 00000-0 10000-3 0 6720
-2 24653 0.2253 89.2534 0001499 183.9454 161.0454 1.00271008 40769
+1 24315U 96054A 08259.37957618 -.00000102 00000-0 10000-3 0 145
+2 24315 0.0240 244.2712 0003610 283.3118 220.7751 1.00271947 44026
+ARABSAT-2B
+1 24652U 96063A 08260.02047255 .00000155 00000-0 00000+0 0 8522
+2 24652 0.0387 187.8754 0003067 358.3704 206.9638 1.00275107 43863
+MEASAT-2
+1 24653U 96063B 08260.61012858 -.00000216 00000-0 10000-3 0 8129
+2 24653 0.8883 82.8550 0001496 85.3343 195.3902 1.00272563 43432
EUROBIRD 9
-1 24665U 96067A 07355.07619726 .00000078 00000-0 10000-3 0 6704
-2 24665 0.0408 76.9109 0006530 194.5458 214.2662 1.00269976 40972
+1 24665U 96067A 08259.83114748 .00000063 00000-0 10000-3 0 7543
+2 24665 0.0420 93.1453 0002817 94.9425 115.2799 1.00273232 43671
INMARSAT 3-F3
-1 24674U 96070A 07359.26787821 .00000042 00000-0 10000-3 0 935
-2 24674 0.0714 352.9971 0005100 274.6557 100.2525 1.00270886 40332
+1 24674U 96070A 08259.63165361 .00000041 00000-0 10000-3 0 4488
+2 24674 0.1312 298.9574 0006720 243.2018 218.3211 1.00274553 42990
AMC-2 (GE-2)
-1 24713U 9700...
[truncated message content] |
|
From: <cs...@us...> - 2008-09-17 18:41:44
|
Revision: 122
http://gpredict.svn.sourceforge.net/gpredict/?rev=122&view=rev
Author: csete
Date: 2008-09-17 18:41:40 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
Updated year.
Modified Paths:
--------------
trunk/src/about.c
trunk/src/about.h
trunk/src/compat.c
trunk/src/compat.h
trunk/src/config-keys.h
trunk/src/defaults.h
trunk/src/first-time.c
trunk/src/first-time.h
trunk/src/gpredict-help.c
trunk/src/gpredict-help.h
trunk/src/gpredict-url-hook.c
trunk/src/gpredict-url-hook.h
trunk/src/gpredict-utils.c
trunk/src/gpredict-utils.h
trunk/src/gtk-azel-plot.c
trunk/src/gtk-azel-plot.h
trunk/src/gtk-freq-knob.c
trunk/src/gtk-freq-knob.h
trunk/src/gtk-met.c
trunk/src/gtk-met.h
trunk/src/gtk-polar-plot.c
trunk/src/gtk-polar-plot.h
trunk/src/gtk-polar-view-popup.c
trunk/src/gtk-polar-view-popup.h
trunk/src/gtk-polar-view.c
trunk/src/gtk-polar-view.h
trunk/src/gtk-rig-ctrl.c
trunk/src/gtk-rig-ctrl.h
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-rot-ctrl.h
trunk/src/gtk-rot-knob.c
trunk/src/gtk-rot-knob.h
trunk/src/gtk-sat-data.c
trunk/src/gtk-sat-data.h
trunk/src/gtk-sat-list-col-sel.c
trunk/src/gtk-sat-list-col-sel.h
trunk/src/gtk-sat-list.c
trunk/src/gtk-sat-list.h
trunk/src/gtk-sat-map-ground-track.c
trunk/src/gtk-sat-map-ground-track.h
trunk/src/gtk-sat-map-popup.c
trunk/src/gtk-sat-map-popup.h
trunk/src/gtk-sat-map.c
trunk/src/gtk-sat-map.h
trunk/src/gtk-sat-module-popup.c
trunk/src/gtk-sat-module-popup.h
trunk/src/gtk-sat-module-tmg.c
trunk/src/gtk-sat-module-tmg.h
trunk/src/gtk-sat-module.c
trunk/src/gtk-sat-module.h
trunk/src/gtk-sat-tree.c
trunk/src/gtk-sat-tree.h
trunk/src/gtk-single-sat.c
trunk/src/gtk-single-sat.h
trunk/src/gtk-sky-glance.c
trunk/src/gtk-sky-glance.h
trunk/src/gui.c
trunk/src/gui.h
trunk/src/loc-tree.c
trunk/src/loc-tree.h
trunk/src/locator.c
trunk/src/locator.h
trunk/src/main.c
trunk/src/map-selector.c
trunk/src/map-selector.h
trunk/src/menubar.c
trunk/src/menubar.h
trunk/src/mod-cfg-get-param.c
trunk/src/mod-cfg-get-param.h
trunk/src/mod-cfg.c
trunk/src/mod-cfg.h
trunk/src/mod-mgr.c
trunk/src/mod-mgr.h
trunk/src/orbit-tools.c
trunk/src/orbit-tools.h
trunk/src/pass-popup-menu.c
trunk/src/pass-popup-menu.h
trunk/src/pass-to-txt.c
trunk/src/pass-to-txt.h
trunk/src/predict-tools.c
trunk/src/predict-tools.h
trunk/src/qth-editor.c
trunk/src/qth-editor.h
trunk/src/radio-conf.c
trunk/src/radio-conf.h
trunk/src/rdv.c
trunk/src/rdv.h
trunk/src/rig-io.c
trunk/src/rig-io.h
trunk/src/rotor-conf.c
trunk/src/rotor-conf.h
trunk/src/sat-cfg.c
trunk/src/sat-cfg.h
trunk/src/sat-log-browser.c
trunk/src/sat-log-browser.h
trunk/src/sat-log.c
trunk/src/sat-log.h
trunk/src/sat-monitor.c
trunk/src/sat-monitor.h
trunk/src/sat-pass-dialogs.c
trunk/src/sat-pass-dialogs.h
trunk/src/sat-popup-menu.c
trunk/src/sat-popup-menu.h
trunk/src/sat-pref-conditions.c
trunk/src/sat-pref-conditions.h
trunk/src/sat-pref-debug.c
trunk/src/sat-pref-debug.h
trunk/src/sat-pref-formats.c
trunk/src/sat-pref-formats.h
trunk/src/sat-pref-general.c
trunk/src/sat-pref-general.h
trunk/src/sat-pref-help.c
trunk/src/sat-pref-help.h
trunk/src/sat-pref-interfaces.c
trunk/src/sat-pref-interfaces.h
trunk/src/sat-pref-layout.c
trunk/src/sat-pref-layout.h
trunk/src/sat-pref-list-view.c
trunk/src/sat-pref-list-view.h
trunk/src/sat-pref-map-view.c
trunk/src/sat-pref-map-view.h
trunk/src/sat-pref-modules.c
trunk/src/sat-pref-modules.h
trunk/src/sat-pref-multi-pass.c
trunk/src/sat-pref-multi-pass.h
trunk/src/sat-pref-polar-view.c
trunk/src/sat-pref-polar-view.h
trunk/src/sat-pref-predict.c
trunk/src/sat-pref-predict.h
trunk/src/sat-pref-qth-data.h
trunk/src/sat-pref-qth-editor.c
trunk/src/sat-pref-qth-editor.h
trunk/src/sat-pref-qth.c
trunk/src/sat-pref-qth.h
trunk/src/sat-pref-refresh.c
trunk/src/sat-pref-refresh.h
trunk/src/sat-pref-rig-data.h
trunk/src/sat-pref-rig-editor.c
trunk/src/sat-pref-rig-editor.h
trunk/src/sat-pref-rig.c
trunk/src/sat-pref-rig.h
trunk/src/sat-pref-rot-data.h
trunk/src/sat-pref-rot-editor.c
trunk/src/sat-pref-rot-editor.h
trunk/src/sat-pref-rot.c
trunk/src/sat-pref-rot.h
trunk/src/sat-pref-single-pass.c
trunk/src/sat-pref-single-pass.h
trunk/src/sat-pref-single-sat.c
trunk/src/sat-pref-single-sat.h
trunk/src/sat-pref-sky-at-glance.c
trunk/src/sat-pref-sky-at-glance.h
trunk/src/sat-pref-tle.c
trunk/src/sat-pref-tle.h
trunk/src/sat-pref.c
trunk/src/sat-pref.h
trunk/src/sat-vis.c
trunk/src/sat-vis.h
trunk/src/save-pass.c
trunk/src/save-pass.h
trunk/src/sgpsdp/sgp4sdp4.c
trunk/src/sgpsdp/sgp_in.c
trunk/src/sgpsdp/test-001.c
trunk/src/sgpsdp/test-002.c
trunk/src/time-tools.c
trunk/src/time-tools.h
trunk/src/tle-lookup.c
trunk/src/tle-lookup.h
trunk/src/tle-tools.c
trunk/src/tle-tools.h
trunk/src/tle-update.c
trunk/src/tle-update.h
Modified: trunk/src/about.c
===================================================================
--- trunk/src/about.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/about.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -53,7 +53,7 @@
};
-const gchar license[] = N_("Copyright (C) 2001-2007 Alexandru Csete OZ9AEC\n"\
+const gchar license[] = N_("Copyright (C) 2001-2008 Alexandru Csete OZ9AEC\n"\
"Contact: oz9aec at googlemail.com\n\n"\
"Gpredict is free software; you can redistribute it and "\
"mofdify it under the terms of the GNU General Public License "\
Modified: trunk/src/about.h
===================================================================
--- trunk/src/about.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/about.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/compat.c
===================================================================
--- trunk/src/compat.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/compat.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/compat.h
===================================================================
--- trunk/src/compat.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/compat.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/config-keys.h
===================================================================
--- trunk/src/config-keys.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/config-keys.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/defaults.h
===================================================================
--- trunk/src/defaults.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/defaults.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/first-time.c
===================================================================
--- trunk/src/first-time.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/first-time.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/first-time.h
===================================================================
--- trunk/src/first-time.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/first-time.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gpredict-help.c
===================================================================
--- trunk/src/gpredict-help.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gpredict-help.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gpredict-help.h
===================================================================
--- trunk/src/gpredict-help.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gpredict-help.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gpredict-url-hook.c
===================================================================
--- trunk/src/gpredict-url-hook.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gpredict-url-hook.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gpredict-url-hook.h
===================================================================
--- trunk/src/gpredict-url-hook.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gpredict-url-hook.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gpredict-utils.c
===================================================================
--- trunk/src/gpredict-utils.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gpredict-utils.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gpredict-utils.h
===================================================================
--- trunk/src/gpredict-utils.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gpredict-utils.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-azel-plot.c
===================================================================
--- trunk/src/gtk-azel-plot.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-azel-plot.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-azel-plot.h
===================================================================
--- trunk/src/gtk-azel-plot.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-azel-plot.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-freq-knob.c
===================================================================
--- trunk/src/gtk-freq-knob.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-freq-knob.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-freq-knob.h
===================================================================
--- trunk/src/gtk-freq-knob.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-freq-knob.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-met.c
===================================================================
--- trunk/src/gtk-met.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-met.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-met.h
===================================================================
--- trunk/src/gtk-met.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-met.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-polar-plot.c
===================================================================
--- trunk/src/gtk-polar-plot.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-polar-plot.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-polar-plot.h
===================================================================
--- trunk/src/gtk-polar-plot.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-polar-plot.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-polar-view-popup.c
===================================================================
--- trunk/src/gtk-polar-view-popup.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-polar-view-popup.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-polar-view-popup.h
===================================================================
--- trunk/src/gtk-polar-view-popup.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-polar-view-popup.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-polar-view.c
===================================================================
--- trunk/src/gtk-polar-view.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-polar-view.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-polar-view.h
===================================================================
--- trunk/src/gtk-polar-view.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-polar-view.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-rig-ctrl.c
===================================================================
--- trunk/src/gtk-rig-ctrl.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-rig-ctrl.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-rig-ctrl.h
===================================================================
--- trunk/src/gtk-rig-ctrl.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-rig-ctrl.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-rot-ctrl.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-rot-ctrl.h
===================================================================
--- trunk/src/gtk-rot-ctrl.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-rot-ctrl.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-rot-knob.c
===================================================================
--- trunk/src/gtk-rot-knob.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-rot-knob.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-rot-knob.h
===================================================================
--- trunk/src/gtk-rot-knob.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-rot-knob.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-data.c
===================================================================
--- trunk/src/gtk-sat-data.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sat-data.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-data.h
===================================================================
--- trunk/src/gtk-sat-data.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sat-data.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-list-col-sel.c
===================================================================
--- trunk/src/gtk-sat-list-col-sel.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sat-list-col-sel.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-list-col-sel.h
===================================================================
--- trunk/src/gtk-sat-list-col-sel.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sat-list-col-sel.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-list.c
===================================================================
--- trunk/src/gtk-sat-list.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sat-list.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-list.h
===================================================================
--- trunk/src/gtk-sat-list.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sat-list.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-map-ground-track.c
===================================================================
--- trunk/src/gtk-sat-map-ground-track.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sat-map-ground-track.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-map-ground-track.h
===================================================================
--- trunk/src/gtk-sat-map-ground-track.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sat-map-ground-track.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-map-popup.c
===================================================================
--- trunk/src/gtk-sat-map-popup.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sat-map-popup.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-map-popup.h
===================================================================
--- trunk/src/gtk-sat-map-popup.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sat-map-popup.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-map.c
===================================================================
--- trunk/src/gtk-sat-map.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sat-map.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Copyright (C) 2006-2007 William J Beksi, KC2EXL.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-map.h
===================================================================
--- trunk/src/gtk-sat-map.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sat-map.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Copyright (C) 2006-2007 William J Beksi, KC2EXL.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-module-popup.c
===================================================================
--- trunk/src/gtk-sat-module-popup.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sat-module-popup.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-module-popup.h
===================================================================
--- trunk/src/gtk-sat-module-popup.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sat-module-popup.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-module-tmg.c
===================================================================
--- trunk/src/gtk-sat-module-tmg.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sat-module-tmg.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-module-tmg.h
===================================================================
--- trunk/src/gtk-sat-module-tmg.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sat-module-tmg.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sat-module.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-module.h
===================================================================
--- trunk/src/gtk-sat-module.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sat-module.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-tree.c
===================================================================
--- trunk/src/gtk-sat-tree.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sat-tree.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-tree.h
===================================================================
--- trunk/src/gtk-sat-tree.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sat-tree.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-single-sat.c
===================================================================
--- trunk/src/gtk-single-sat.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-single-sat.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-single-sat.h
===================================================================
--- trunk/src/gtk-single-sat.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-single-sat.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sky-glance.c
===================================================================
--- trunk/src/gtk-sky-glance.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sky-glance.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sky-glance.h
===================================================================
--- trunk/src/gtk-sky-glance.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gtk-sky-glance.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gui.c
===================================================================
--- trunk/src/gui.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gui.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gui.h
===================================================================
--- trunk/src/gui.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/gui.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/loc-tree.c
===================================================================
--- trunk/src/loc-tree.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/loc-tree.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/loc-tree.h
===================================================================
--- trunk/src/loc-tree.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/loc-tree.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/locator.c
===================================================================
--- trunk/src/locator.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/locator.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -11,7 +11,7 @@
/*
* Hamlib Interface - locator and bearing conversion calls
- * Copyright (c) 2001-2007 by Stephane Fillod
+ * Copyright (c) 2001-2008 by Stephane Fillod
* Copyright (c) 2003 by Nate Bargmann
* Copyright (c) 2003 by Dave Hines
*
Modified: trunk/src/locator.h
===================================================================
--- trunk/src/locator.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/locator.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/main.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/map-selector.c
===================================================================
--- trunk/src/map-selector.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/map-selector.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/map-selector.h
===================================================================
--- trunk/src/map-selector.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/map-selector.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/menubar.c
===================================================================
--- trunk/src/menubar.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/menubar.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/menubar.h
===================================================================
--- trunk/src/menubar.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/menubar.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/mod-cfg-get-param.c
===================================================================
--- trunk/src/mod-cfg-get-param.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/mod-cfg-get-param.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/mod-cfg-get-param.h
===================================================================
--- trunk/src/mod-cfg-get-param.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/mod-cfg-get-param.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/mod-cfg.c
===================================================================
--- trunk/src/mod-cfg.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/mod-cfg.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/mod-cfg.h
===================================================================
--- trunk/src/mod-cfg.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/mod-cfg.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/mod-mgr.c
===================================================================
--- trunk/src/mod-mgr.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/mod-mgr.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/mod-mgr.h
===================================================================
--- trunk/src/mod-mgr.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/mod-mgr.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/orbit-tools.c
===================================================================
--- trunk/src/orbit-tools.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/orbit-tools.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Parts are Copyright John A. Magliacane, KD2BD 1991-2003 (indicated below)
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/orbit-tools.h
===================================================================
--- trunk/src/orbit-tools.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/orbit-tools.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/pass-popup-menu.c
===================================================================
--- trunk/src/pass-popup-menu.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/pass-popup-menu.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/pass-popup-menu.h
===================================================================
--- trunk/src/pass-popup-menu.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/pass-popup-menu.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/pass-to-txt.c
===================================================================
--- trunk/src/pass-to-txt.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/pass-to-txt.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/pass-to-txt.h
===================================================================
--- trunk/src/pass-to-txt.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/pass-to-txt.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/predict-tools.c
===================================================================
--- trunk/src/predict-tools.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/predict-tools.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Parts are Copyright John A. Magliacane, KD2BD 1991-2003 (indicated below)
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/predict-tools.h
===================================================================
--- trunk/src/predict-tools.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/predict-tools.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/qth-editor.c
===================================================================
--- trunk/src/qth-editor.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/qth-editor.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/qth-editor.h
===================================================================
--- trunk/src/qth-editor.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/qth-editor.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/radio-conf.c
===================================================================
--- trunk/src/radio-conf.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/radio-conf.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete.
+ Copyright (C) 2001-2008 Alexandru Csete.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/radio-conf.h
===================================================================
--- trunk/src/radio-conf.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/radio-conf.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete.
+ Copyright (C) 2001-2008 Alexandru Csete.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/rdv.c
===================================================================
--- trunk/src/rdv.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/rdv.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/rdv.h
===================================================================
--- trunk/src/rdv.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/rdv.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/rig-io.c
===================================================================
--- trunk/src/rig-io.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/rig-io.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete.
+ Copyright (C) 2001-2008 Alexandru Csete.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/rig-io.h
===================================================================
--- trunk/src/rig-io.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/rig-io.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete.
+ Copyright (C) 2001-2008 Alexandru Csete.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/rotor-conf.c
===================================================================
--- trunk/src/rotor-conf.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/rotor-conf.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete.
+ Copyright (C) 2001-2008 Alexandru Csete.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/rotor-conf.h
===================================================================
--- trunk/src/rotor-conf.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/rotor-conf.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete.
+ Copyright (C) 2001-2008 Alexandru Csete.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-cfg.c
===================================================================
--- trunk/src/sat-cfg.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-cfg.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-cfg.h
===================================================================
--- trunk/src/sat-cfg.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-cfg.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-log-browser.c
===================================================================
--- trunk/src/sat-log-browser.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-log-browser.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-log-browser.h
===================================================================
--- trunk/src/sat-log-browser.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-log-browser.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-log.c
===================================================================
--- trunk/src/sat-log.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-log.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-log.h
===================================================================
--- trunk/src/sat-log.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-log.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-monitor.c
===================================================================
--- trunk/src/sat-monitor.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-monitor.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-monitor.h
===================================================================
--- trunk/src/sat-monitor.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-monitor.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-pass-dialogs.c
===================================================================
--- trunk/src/sat-pass-dialogs.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-pass-dialogs.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-pass-dialogs.h
===================================================================
--- trunk/src/sat-pass-dialogs.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-pass-dialogs.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-popup-menu.c
===================================================================
--- trunk/src/sat-popup-menu.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-popup-menu.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-popup-menu.h
===================================================================
--- trunk/src/sat-popup-menu.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-popup-menu.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-pref-conditions.c
===================================================================
--- trunk/src/sat-pref-conditions.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-pref-conditions.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-pref-conditions.h
===================================================================
--- trunk/src/sat-pref-conditions.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-pref-conditions.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-pref-debug.c
===================================================================
--- trunk/src/sat-pref-debug.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-pref-debug.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-pref-debug.h
===================================================================
--- trunk/src/sat-pref-debug.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-pref-debug.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-pref-formats.c
===================================================================
--- trunk/src/sat-pref-formats.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-pref-formats.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-pref-formats.h
===================================================================
--- trunk/src/sat-pref-formats.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-pref-formats.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-pref-general.c
===================================================================
--- trunk/src/sat-pref-general.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-pref-general.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-pref-general.h
===================================================================
--- trunk/src/sat-pref-general.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-pref-general.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-pref-help.c
===================================================================
--- trunk/src/sat-pref-help.c 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-pref-help.c 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-pref-help.h
===================================================================
--- trunk/src/sat-pref-help.h 2008-09-17 18:10:05 UTC (rev 121)
+++ trunk/src/sat-pref-help.h 2008-09-17 18:41:40 UTC (rev 122)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexan...
[truncated message content] |
|
From: <cs...@us...> - 2008-09-17 18:09:54
|
Revision: 121
http://gpredict.svn.sourceforge.net/gpredict/?rev=121&view=rev
Author: csete
Date: 2008-09-17 18:10:05 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
Disable debug prints.
Modified Paths:
--------------
trunk/src/gtk-rig-ctrl.c
trunk/src/gtk-rig-ctrl.h
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-rot-ctrl.h
Modified: trunk/src/gtk-rig-ctrl.c
===================================================================
--- trunk/src/gtk-rig-ctrl.c 2008-09-17 18:08:24 UTC (rev 120)
+++ trunk/src/gtk-rig-ctrl.c 2008-09-17 18:10:05 UTC (rev 121)
@@ -731,6 +731,7 @@
gtk_widget_set_sensitive (ctrl->DevSel, FALSE);
ctrl->engaged = TRUE;
+ ctrl->wrops = 0;
}
}
@@ -784,6 +785,8 @@
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s: MAX_ERROR_COUNT (%d) reached. Disengaging device!"),
__FUNCTION__, MAX_ERROR_COUNT);
+
+ //g_print ("ERROR. WROPS = %d\n", ctrl->wrops);
}
else {
/* increment error counter */
@@ -792,6 +795,7 @@
}
}
+ //g_print (" WROPS = %d\n", ctrl->wrops);
ctrl->busy = FALSE;
@@ -871,6 +875,8 @@
shutdown (sock, SHUT_RDWR);
close (sock);
+ ctrl->wrops++;
+
return TRUE;
}
Modified: trunk/src/gtk-rig-ctrl.h
===================================================================
--- trunk/src/gtk-rig-ctrl.h 2008-09-17 18:08:24 UTC (rev 120)
+++ trunk/src/gtk-rig-ctrl.h 2008-09-17 18:10:05 UTC (rev 121)
@@ -89,6 +89,10 @@
gboolean busy; /*!< Flag set when control algorithm is busy. */
gboolean engaged; /*!< Flag indicating that rig device is engaged. */
gint errcnt; /*!< Error counter. */
+
+ /* debug related */
+ guint wrops;
+ guint rdops;
};
struct _GtkRigCtrlClass
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2008-09-17 18:08:24 UTC (rev 120)
+++ trunk/src/gtk-rot-ctrl.c 2008-09-17 18:10:05 UTC (rev 121)
@@ -760,9 +760,11 @@
{
GtkRotCtrl *ctrl = GTK_ROT_CTRL (data);
- if (gtk_toggle_button_get_active (button)) {
- gtk_widget_set_sensitive (ctrl->DevSel, FALSE);
- ctrl->engaged = TRUE;
+ if (!gtk_toggle_button_get_active (button)) {
+ gtk_widget_set_sensitive (ctrl->DevSel, TRUE);
+ ctrl->engaged = FALSE;
+ gtk_label_set_text (GTK_LABEL (ctrl->AzRead), "---");
+ gtk_label_set_text (GTK_LABEL (ctrl->ElRead), "---");
}
else {
if (ctrl->conf == NULL) {
@@ -772,11 +774,11 @@
__FUNCTION__);
return;
}
- gtk_widget_set_sensitive (ctrl->DevSel, TRUE);
- ctrl->engaged = FALSE;
+ gtk_widget_set_sensitive (ctrl->DevSel, FALSE);
+ ctrl->engaged = TRUE;
- gtk_label_set_text (GTK_LABEL (ctrl->AzRead), "---");
- gtk_label_set_text (GTK_LABEL (ctrl->ElRead), "---");
+ ctrl->wrops = 0;
+ ctrl->rdops = 0;
}
}
@@ -838,11 +840,15 @@
text = g_strdup_printf ("%.2f\302\260", rotel);
gtk_label_set_text (GTK_LABEL (ctrl->ElRead), text);
g_free (text);
+
+ gtk_polar_plot_set_rotor_pos (GTK_POLAR_PLOT (ctrl->plot), rotaz, rotel);
}
else {
gtk_label_set_text (GTK_LABEL (ctrl->AzRead), _("ERROR"));
gtk_label_set_text (GTK_LABEL (ctrl->ElRead), _("ERROR"));
error = TRUE;
+
+ gtk_polar_plot_set_rotor_pos (GTK_POLAR_PLOT (ctrl->plot), -1.0, -1.0);
}
/* if tolerance exceeded */
@@ -870,17 +876,30 @@
_("%s: MAX_ERROR_COUNT (%d) reached. Disengaging device!"),
__FUNCTION__, MAX_ERROR_COUNT);
ctrl->errcnt = 0;
+ //g_print ("ERROR. WROPS: %d RDOPS: %d\n", ctrl->wrops, ctrl->rdops);
}
else {
/* increment error counter */
ctrl->errcnt++;
}
}
-
- /* TODO: update polar plot */
}
+ else {
+ /* ensure rotor pos is not visible on plot */
+ gtk_polar_plot_set_rotor_pos (GTK_POLAR_PLOT (ctrl->plot), -1.0, -1.0);
+ }
+ /* update target object on polar plot */
+ if (ctrl->target != NULL) {
+ gtk_polar_plot_set_target_pos (GTK_POLAR_PLOT (ctrl->plot), ctrl->target->az, ctrl->target->el);
+ }
+
+ /* update controller circle on polar plot */
+ gtk_polar_plot_set_ctrl_pos (GTK_POLAR_PLOT (ctrl->plot),
+ gtk_rot_knob_get_value (GTK_ROT_KNOB (ctrl->AzSet)),
+ gtk_rot_knob_get_value (GTK_ROT_KNOB (ctrl->ElSet)));
+
ctrl->busy = FALSE;
return TRUE;
@@ -997,6 +1016,9 @@
shutdown (sock, SHUT_RDWR);
close (sock);
+ ctrl->wrops++;
+ ctrl->rdops++;
+
return TRUE;
}
@@ -1074,12 +1096,14 @@
__FILE__, __LINE__, written, size);
}
- g_print ("SZ:%d WR:%d AZ:%s EL:%s STR:%s", size, written, azstr, elstr, buff);
+ //g_print ("SZ:%d WR:%d AZ:%s EL:%s STR:%s", size, written, azstr, elstr, buff);
g_free (buff);
shutdown (sock, SHUT_RDWR);
close (sock);
+
+ ctrl->wrops++;
return TRUE;
}
Modified: trunk/src/gtk-rot-ctrl.h
===================================================================
--- trunk/src/gtk-rot-ctrl.h 2008-09-17 18:08:24 UTC (rev 120)
+++ trunk/src/gtk-rot-ctrl.h 2008-09-17 18:10:05 UTC (rev 121)
@@ -93,6 +93,10 @@
gboolean engaged; /*!< Flag indicating that rotor device is engaged. */
gint errcnt; /*!< Error counter. */
+
+ /* debug related */
+ guint wrops;
+ guint rdops;
};
struct _GtkRotCtrlClass
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-17 18:08:14
|
Revision: 120
http://gpredict.svn.sourceforge.net/gpredict/?rev=120&view=rev
Author: csete
Date: 2008-09-17 18:08:24 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
Added markers for target, controller and rotator.
Modified Paths:
--------------
trunk/src/gtk-polar-plot.c
trunk/src/gtk-polar-plot.h
Modified: trunk/src/gtk-polar-plot.c
===================================================================
--- trunk/src/gtk-polar-plot.c 2008-09-17 10:59:23 UTC (rev 119)
+++ trunk/src/gtk-polar-plot.c 2008-09-17 18:08:24 UTC (rev 120)
@@ -155,6 +155,7 @@
polview->qthinfo = FALSE;
polview->cursinfo = FALSE;
polview->extratick = FALSE;
+ polview->target = NULL;
}
@@ -270,6 +271,275 @@
}
+
+/** \brief Set target object position
+ * \param plot Pointer to the GtkPolarPlot widget
+ * \param az Azimuth of the target object
+ * \param el Elevation of the target object
+ *
+ * If either az or el are negative the target object will be hidden
+ */
+void gtk_polar_plot_set_target_pos (GtkPolarPlot *plot, gdouble az, gdouble el)
+{
+ GooCanvasItemModel *root;
+ gint idx;
+ gfloat x,y;
+ guint32 col;
+
+
+ if (plot == NULL)
+ return;
+
+
+ root = goo_canvas_get_root_item_model (GOO_CANVAS (plot->canvas));
+
+ if ((az < 0.0) || (el < 0.0)) {
+ if (plot->target != NULL) {
+ /* the target object is visible; delete it */
+ idx = goo_canvas_item_model_find_child (root, plot->target);
+ if (idx != -1) {
+ goo_canvas_item_model_remove_child (root, idx);
+ }
+ plot->target = NULL;
+ }
+ /* else the target object is not visible; nothing to do */
+ }
+ else {
+ /* we need to either update or create the object */
+ azel_to_xy (plot, az, el, &x, &y);
+
+ if (plot->target != NULL) {
+ /* the target object already exists; move it */
+ g_object_set (plot->target,
+ "x", x - MARKER_SIZE_HALF,
+ "y", y - MARKER_SIZE_HALF,
+ NULL);
+ }
+ else {
+ /* the target object does not exist; create it */
+ col = sat_cfg_get_int (SAT_CFG_INT_POLAR_SAT_COL);
+ plot->target = goo_canvas_rect_model_new (root,
+ x - MARKER_SIZE_HALF,
+ y - MARKER_SIZE_HALF,
+ 2*MARKER_SIZE_HALF,
+ 2*MARKER_SIZE_HALF,
+ "fill-color-rgba", col,
+ "stroke-color-rgba", col,
+ NULL);
+ }
+ }
+}
+
+
+/** \brief Set controller object position
+ * \param plot Pointer to the GtkPolarPlot widget
+ * \param az Azimuth of the controller object
+ * \param el Elevation of the controller object
+ *
+ * If either az or el are negative the controller object will be hidden
+ */
+void gtk_polar_plot_set_ctrl_pos (GtkPolarPlot *plot, gdouble az, gdouble el)
+{
+ GooCanvasItemModel *root;
+ gint idx;
+ gfloat x,y;
+ guint32 col;
+
+
+ if (plot == NULL)
+ return;
+
+
+ root = goo_canvas_get_root_item_model (GOO_CANVAS (plot->canvas));
+
+ if ((az < 0.0) || (el < 0.0)) {
+ if (plot->ctrl != NULL) {
+ /* the target object is visible; delete it */
+ idx = goo_canvas_item_model_find_child (root, plot->ctrl);
+ if (idx != -1) {
+ goo_canvas_item_model_remove_child (root, idx);
+ }
+ plot->ctrl = NULL;
+ }
+ /* else the target object is not visible; nothing to do */
+ }
+ else {
+ /* we need to either update or create the object */
+ azel_to_xy (plot, az, el, &x, &y);
+
+ if (plot->ctrl != NULL) {
+ /* the target object already exists; move it */
+ g_object_set (plot->ctrl,
+ "center_x", x,
+ "center_y", y,
+ NULL);
+ }
+ else {
+ /* the target object does not exist; create it */
+ col = sat_cfg_get_int (SAT_CFG_INT_POLAR_SAT_COL);
+ plot->ctrl = goo_canvas_ellipse_model_new (root,
+ x, y, 7, 7,
+ "fill-color-rgba", 0xFF00000F,
+ "stroke-color-rgba", col,
+ "line-width", 0.8,
+ NULL);
+ }
+ }
+
+}
+
+
+/** \brief Set rotator object position
+ * \param plot Pointer to the GtkPolarPlot widget
+ * \param az Azimuth of the rotator object
+ * \param el Elevation of the rotator object
+ *
+ * If either az or el are negative the controller object will be hidden
+ */
+void gtk_polar_plot_set_rotor_pos (GtkPolarPlot *plot, gdouble az, gdouble el)
+{
+ GooCanvasItemModel *root;
+ GooCanvasPoints *prec;
+ gint idx;
+ gfloat x,y;
+ guint32 col;
+
+
+ if (plot == NULL)
+ return;
+
+
+ root = goo_canvas_get_root_item_model (GOO_CANVAS (plot->canvas));
+
+ if ((az < 0.0) || (el <= 0.0)) {
+ if (plot->rot1 != NULL) {
+ /* the target object is visible; delete it */
+ idx = goo_canvas_item_model_find_child (root, plot->rot1);
+ if (idx != -1) {
+ goo_canvas_item_model_remove_child (root, idx);
+ }
+ plot->rot1 = NULL;
+ }
+ if (plot->rot2 != NULL) {
+ /* the target object is visible; delete it */
+ idx = goo_canvas_item_model_find_child (root, plot->rot2);
+ if (idx != -1) {
+ goo_canvas_item_model_remove_child (root, idx);
+ }
+ plot->rot2 = NULL;
+ }
+ if (plot->rot3 != NULL) {
+ /* the target object is visible; delete it */
+ idx = goo_canvas_item_model_find_child (root, plot->rot3);
+ if (idx != -1) {
+ goo_canvas_item_model_remove_child (root, idx);
+ }
+ plot->rot3 = NULL;
+ }
+ if (plot->rot4 != NULL) {
+ /* the target object is visible; delete it */
+ idx = goo_canvas_item_model_find_child (root, plot->rot4);
+ if (idx != -1) {
+ goo_canvas_item_model_remove_child (root, idx);
+ }
+ plot->rot4 = NULL;
+ }
+ }
+ else {
+ /* we need to either update or create the object */
+ azel_to_xy (plot, az, el, &x, &y);
+ col = sat_cfg_get_int (SAT_CFG_INT_POLAR_SAT_COL);
+
+
+ if (plot->rot1 != NULL) {
+ /* the target object already exists; move it */
+ prec = goo_canvas_points_new (2);
+ prec->coords[0] = x;
+ prec->coords[1] = y-4;
+ prec->coords[2] = x;
+ prec->coords[3] = y-14;
+ g_object_set (plot->rot1,
+ "points", prec,
+ NULL);
+ goo_canvas_points_unref (prec);
+ }
+ else {
+ /* the target object does not exist; create it */
+ plot->rot1 = goo_canvas_polyline_model_new_line (root,
+ x, y-4, x, y-14,
+ "fill-color-rgba", col,
+ "stroke-color-rgba", col,
+ "line-width", 1.0,
+ NULL);
+ }
+ if (plot->rot2 != NULL) {
+ /* the target object already exists; move it */
+ prec = goo_canvas_points_new (2);
+ prec->coords[0] = x+4;
+ prec->coords[1] = y;
+ prec->coords[2] = x+14;
+ prec->coords[3] = y;
+ g_object_set (plot->rot2,
+ "points", prec,
+ NULL);
+ goo_canvas_points_unref (prec);
+ }
+ else {
+ /* the target object does not exist; create it */
+ plot->rot2 = goo_canvas_polyline_model_new_line (root,
+ x+4, y, x+14, y,
+ "fill-color-rgba", col,
+ "stroke-color-rgba", col,
+ "line-width", 1.0,
+ NULL);
+ }
+ if (plot->rot3 != NULL) {
+ /* the target object already exists; move it */
+ prec = goo_canvas_points_new (2);
+ prec->coords[0] = x;
+ prec->coords[1] = y+4;
+ prec->coords[2] = x;
+ prec->coords[3] = y+14;
+ g_object_set (plot->rot3,
+ "points", prec,
+ NULL);
+ goo_canvas_points_unref (prec);
+ }
+ else {
+ /* the target object does not exist; create it */
+ plot->rot3 = goo_canvas_polyline_model_new_line (root,
+ x, y+4, x, y+14,
+ "fill-color-rgba", col,
+ "stroke-color-rgba", col,
+ "line-width", 1.0,
+ NULL);
+ }
+ if (plot->rot4 != NULL) {
+ /* the target object already exists; move it */
+ prec = goo_canvas_points_new (2);
+ prec->coords[0] = x-4;
+ prec->coords[1] = y;
+ prec->coords[2] = x-14;
+ prec->coords[3] = y;
+ g_object_set (plot->rot4,
+ "points", prec,
+ NULL);
+ goo_canvas_points_unref (prec);
+ }
+ else {
+ /* the target object does not exist; create it */
+ plot->rot4 = goo_canvas_polyline_model_new_line (root,
+ x-4, y, x-14, y,
+ "fill-color-rgba", col,
+ "stroke-color-rgba", col,
+ "line-width", 1.0,
+ NULL);
+ }
+ }
+
+}
+
+
/** \brief Show/hide time tick
* \param plot Pointer to the GtkPolarPlot widget
* \param show TRUE => show tick. FALSE => don't show
@@ -599,7 +869,9 @@
/* sky track */
if (polv->pass != NULL)
update_track (polv);
+
+
}
}
Modified: trunk/src/gtk-polar-plot.h
===================================================================
--- trunk/src/gtk-polar-plot.h 2008-09-17 10:59:23 UTC (rev 119)
+++ trunk/src/gtk-polar-plot.h 2008-09-17 18:08:24 UTC (rev 120)
@@ -91,6 +91,9 @@
pass_t *pass;
GooCanvasItemModel *track; /*!< Sky track. */
+ GooCanvasItemModel *target; /*!< Target object marker */
+ GooCanvasItemModel *ctrl; /*!< Position marker for the controller */
+ GooCanvasItemModel *rot1,*rot2,*rot3,*rot4; /*!< Position marker for the rotor */
GooCanvasItemModel *trtick[TRACK_TICK_NUM]; /*!< Time ticks along the sky track */
qth_t *qth; /*!< Pointer to current location. */
@@ -121,7 +124,9 @@
GtkWidget* gtk_polar_plot_new (qth_t *qth, pass_t *pass);
void gtk_polar_plot_set_pass (GtkPolarPlot *plot, pass_t *pass);
-
+void gtk_polar_plot_set_target_pos (GtkPolarPlot *plot, gdouble az, gdouble el);
+void gtk_polar_plot_set_ctrl_pos (GtkPolarPlot *plot, gdouble az, gdouble el);
+void gtk_polar_plot_set_rotor_pos (GtkPolarPlot *plot, gdouble az, gdouble el);
void gtk_polar_plot_show_time_ticks (GtkPolarPlot *plot, gboolean show);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-17 10:51:21
|
Revision: 117
http://gpredict.svn.sourceforge.net/gpredict/?rev=117&view=rev
Author: csete
Date: 2008-09-17 10:51:31 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
Removed unused var.
Modified Paths:
--------------
trunk/src/gtk-rot-ctrl.c
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2008-09-17 10:48:52 UTC (rev 116)
+++ trunk/src/gtk-rot-ctrl.c 2008-09-17 10:51:31 UTC (rev 117)
@@ -460,7 +460,6 @@
create_conf_widgets (GtkRotCtrl *ctrl)
{
GtkWidget *frame,*table,*label,*timer,*toler;
- GtkWidget *lock;
GDir *dir = NULL; /* directory handle */
GError *error = NULL; /* error flag and info */
gchar *cfgdir;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-17 10:48:40
|
Revision: 116
http://gpredict.svn.sourceforge.net/gpredict/?rev=116&view=rev
Author: csete
Date: 2008-09-17 10:48:52 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
Added error handling. After 5 comm errors the device is disengaged.
Modified Paths:
--------------
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-rot-ctrl.h
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2008-09-16 23:28:12 UTC (rev 115)
+++ trunk/src/gtk-rot-ctrl.c 2008-09-17 10:48:52 UTC (rev 116)
@@ -57,6 +57,7 @@
/* END */
#define FMTSTR "%7.2f\302\260"
+#define MAX_ERROR_COUNT 5
static void gtk_rot_ctrl_class_init (GtkRotCtrlClass *class);
@@ -81,8 +82,8 @@
static gboolean rot_ctrl_timeout_cb (gpointer data);
static void update_count_down (GtkRotCtrl *ctrl, gdouble t);
-static void get_pos (GtkRotCtrl *ctrl, gdouble *az, gdouble *el);
-static void set_pos (GtkRotCtrl *ctrl, gdouble az, gdouble el);
+static gboolean get_pos (GtkRotCtrl *ctrl, gdouble *az, gdouble *el);
+static gboolean set_pos (GtkRotCtrl *ctrl, gdouble az, gdouble el);
static GtkVBoxClass *parent_class = NULL;
@@ -157,6 +158,7 @@
ctrl->delay = 1000;
ctrl->timerid = 0;
ctrl->tolerance = 1.0;
+ ctrl->errcnt = 0;
}
static void
@@ -515,10 +517,10 @@
gtk_table_attach_defaults (GTK_TABLE (table), ctrl->DevSel, 1, 2, 0, 1);
/* Engage button */
- lock = gtk_toggle_button_new_with_label (_("Engage"));
- gtk_widget_set_tooltip_text (lock, _("Engage the selcted rotor device"));
- g_signal_connect (lock, "toggled", G_CALLBACK (rot_locked_cb), ctrl);
- gtk_table_attach_defaults (GTK_TABLE (table), lock, 2, 3, 0, 1);
+ ctrl->LockBut = gtk_toggle_button_new_with_label (_("Engage"));
+ gtk_widget_set_tooltip_text (ctrl->LockBut, _("Engage the selcted rotor device"));
+ g_signal_connect (ctrl->LockBut, "toggled", G_CALLBACK (rot_locked_cb), ctrl);
+ gtk_table_attach_defaults (GTK_TABLE (table), ctrl->LockBut, 2, 3, 0, 1);
/* Timeout */
label = gtk_label_new (_("Cycle:"));
@@ -791,6 +793,7 @@
gdouble rotaz=0.0, rotel=0.0;
gdouble setaz,setel;
gchar *text;
+ gboolean error = FALSE;
if (ctrl->busy) {
@@ -827,15 +830,21 @@
if ((ctrl->engaged) && (ctrl->conf != NULL)) {
/* read back current value from device */
- get_pos (ctrl, &rotaz, &rotel);
+ if (get_pos (ctrl, &rotaz, &rotel)) {
- /* update display widgets */
- text = g_strdup_printf ("%.2f\302\260", rotaz);
- gtk_label_set_text (GTK_LABEL (ctrl->AzRead), text);
- g_free (text);
- text = g_strdup_printf ("%.2f\302\260", rotel);
- gtk_label_set_text (GTK_LABEL (ctrl->ElRead), text);
- g_free (text);
+ /* update display widgets */
+ text = g_strdup_printf ("%.2f\302\260", rotaz);
+ gtk_label_set_text (GTK_LABEL (ctrl->AzRead), text);
+ g_free (text);
+ text = g_strdup_printf ("%.2f\302\260", rotel);
+ gtk_label_set_text (GTK_LABEL (ctrl->ElRead), text);
+ g_free (text);
+ }
+ else {
+ gtk_label_set_text (GTK_LABEL (ctrl->AzRead), _("ERROR"));
+ gtk_label_set_text (GTK_LABEL (ctrl->ElRead), _("ERROR"));
+ error = TRUE;
+ }
/* if tolerance exceeded */
setaz = gtk_rot_knob_get_value (GTK_ROT_KNOB (ctrl->AzSet));
@@ -843,9 +852,33 @@
if ((fabs(setaz-rotaz) > ctrl->tolerance) ||
(fabs(setel-rotel) > ctrl->tolerance)) {
/* send controller values to rotator device */
- set_pos (ctrl, setaz, setel);
+ if (!set_pos (ctrl, setaz, setel)) {
+ error = TRUE;
+ }
}
+ /* check error status */
+ if (!error) {
+ /* reset error counter */
+ ctrl->errcnt = 0;
+ }
+ else {
+ if (ctrl->errcnt >= MAX_ERROR_COUNT) {
+ /* disengage device */
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ctrl->LockBut), FALSE);
+ ctrl->engaged = FALSE;
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: MAX_ERROR_COUNT (%d) reached. Disengaging device!"),
+ __FUNCTION__, MAX_ERROR_COUNT);
+ ctrl->errcnt = 0;
+ }
+ else {
+ /* increment error counter */
+ ctrl->errcnt++;
+ }
+ }
+
+ g_print ("COUNT: %d\n", ctrl->errcnt);
/* TODO: update polar plot */
}
@@ -860,8 +893,10 @@
* \param ctrl Pointer to the GtkRotCtrl widget.
* \param az The current Az as read from the device
* \param el The current El as read from the device
+ * \return TRUE if the position was successfully retrieved, FALSE if an
+ * error occurred.
*/
-static void get_pos (GtkRotCtrl *ctrl, gdouble *az, gdouble *el)
+static gboolean get_pos (GtkRotCtrl *ctrl, gdouble *az, gdouble *el)
{
gchar *buff,**vbuff;
gint written,size;
@@ -875,7 +910,7 @@
sat_log_log (SAT_LOG_LEVEL_BUG,
_("%s:%d: NULL storage."),
__FILE__, __LINE__);
- return;
+ return FALSE;
}
/* create socket */
@@ -884,7 +919,7 @@
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s:%d: Failed to create socket"),
__FILE__, __LINE__);
- return;
+ return FALSE;
}
else {
sat_log_log (SAT_LOG_LEVEL_DEBUG,
@@ -904,7 +939,7 @@
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s:%d: Failed to connect to %s:%d"),
__FILE__, __LINE__, ctrl->conf->host, ctrl->conf->port);
- return;
+ return FALSE;
}
else {
sat_log_log (SAT_LOG_LEVEL_DEBUG,
@@ -938,7 +973,7 @@
__FILE__, __FUNCTION__);
shutdown (sock, SHUT_RDWR);
close (sock);
- return;
+ return FALSE;
}
size = read (sock, buff, 127);
@@ -964,7 +999,7 @@
shutdown (sock, SHUT_RDWR);
close (sock);
-
+ return TRUE;
}
@@ -972,11 +1007,13 @@
* \param ctrl Poitner to the GtkRotCtrl widget
* \param az The new Azimuth
* \param el The new Elevation
+ * \return TRUE if the new position has been sent successfully
+ * FALSE if an error occurred
*
* \note The function does not perform any range check since the GtkRotKnob
* should always keep its value within range.
*/
-static void set_pos (GtkRotCtrl *ctrl, gdouble az, gdouble el)
+static gboolean set_pos (GtkRotCtrl *ctrl, gdouble az, gdouble el)
{
gchar *buff;
gchar azstr[8],elstr[8];
@@ -993,7 +1030,7 @@
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s:%d: Failed to create socket"),
__FILE__, __LINE__);
- return;
+ return FALSE;
}
else {
sat_log_log (SAT_LOG_LEVEL_DEBUG,
@@ -1013,7 +1050,7 @@
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s:%d: Failed to connect to %s:%d"),
__FILE__, __LINE__, ctrl->conf->host, ctrl->conf->port);
- return;
+ return FALSE;
}
else {
sat_log_log (SAT_LOG_LEVEL_DEBUG,
@@ -1046,7 +1083,7 @@
shutdown (sock, SHUT_RDWR);
close (sock);
-
+ return TRUE;
}
Modified: trunk/src/gtk-rot-ctrl.h
===================================================================
--- trunk/src/gtk-rot-ctrl.h 2008-09-16 23:28:12 UTC (rev 115)
+++ trunk/src/gtk-rot-ctrl.h 2008-09-17 10:48:52 UTC (rev 116)
@@ -73,6 +73,7 @@
GtkWidget *SatCnt;
GtkWidget *DevSel;
GtkWidget *plot; /*!< Polar plot widget */
+ GtkWidget *LockBut;
rotor_conf_t *conf;
gdouble t; /*!< Time when sat data last has been updated. */
@@ -90,6 +91,8 @@
gboolean tracking; /*!< Flag set when we are tracking a target. */
gboolean busy; /*!< Flag set when control algorithm is busy. */
gboolean engaged; /*!< Flag indicating that rotor device is engaged. */
+
+ gint errcnt; /*!< Error counter. */
};
struct _GtkRotCtrlClass
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-16 23:28:04
|
Revision: 115
http://gpredict.svn.sourceforge.net/gpredict/?rev=115&view=rev
Author: csete
Date: 2008-09-16 23:28:12 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
Finished implementation of the controller.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-rot-ctrl.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-16 20:38:57 UTC (rev 114)
+++ trunk/ChangeLog 2008-09-16 23:28:12 UTC (rev 115)
@@ -1,3 +1,10 @@
+2008-09-16; Alexandru Csete <oz...@gm...>
+
+ * src/gtk-rot-ctrl.[ch]:
+ Implemented correct management of next pass taking into account
+ that we may run in simulated time mode.
+
+
2008-09-10; Alexandru Csete <oz...@gm...>
* src/gtk-polar-plot.[ch]:
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2008-09-16 20:38:57 UTC (rev 114)
+++ trunk/src/gtk-rot-ctrl.c 2008-09-16 23:28:12 UTC (rev 115)
@@ -544,8 +544,8 @@
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
- toler = gtk_spin_button_new_with_range (0.0, 10.0, 0.1);
- gtk_spin_button_set_digits (GTK_SPIN_BUTTON (toler), 1);
+ toler = gtk_spin_button_new_with_range (0.01, 10.0, 0.01);
+ gtk_spin_button_set_digits (GTK_SPIN_BUTTON (toler), 2);
gtk_widget_set_tooltip_text (toler,
_("This parameter controls the tolerance between "\
"the target and rotator values for the rotator.\n"\
@@ -729,6 +729,10 @@
sat_log_log (SAT_LOG_LEVEL_MSG,
_("Loaded new rotator configuration %s"),
ctrl->conf->name);
+
+ /* update new ranges of the Az and El controller widgets */
+ gtk_rot_knob_set_range (GTK_ROT_KNOB (ctrl->AzSet), ctrl->conf->minaz, ctrl->conf->maxaz);
+ gtk_rot_knob_set_range (GTK_ROT_KNOB (ctrl->ElSet), ctrl->conf->minel, ctrl->conf->maxel);
}
else {
sat_log_log (SAT_LOG_LEVEL_ERROR,
@@ -785,6 +789,7 @@
{
GtkRotCtrl *ctrl = GTK_ROT_CTRL (data);
gdouble rotaz=0.0, rotel=0.0;
+ gdouble setaz,setel;
gchar *text;
@@ -833,7 +838,14 @@
g_free (text);
/* if tolerance exceeded */
- /* TODO: send controller values to rotator device */
+ setaz = gtk_rot_knob_get_value (GTK_ROT_KNOB (ctrl->AzSet));
+ setel = gtk_rot_knob_get_value (GTK_ROT_KNOB (ctrl->ElSet));
+ if ((fabs(setaz-rotaz) > ctrl->tolerance) ||
+ (fabs(setel-rotel) > ctrl->tolerance)) {
+ /* send controller values to rotator device */
+ set_pos (ctrl, setaz, setel);
+ }
+
/* TODO: update polar plot */
}
@@ -956,9 +968,85 @@
}
+/** \brief Send new position to rotator device
+ * \param ctrl Poitner to the GtkRotCtrl widget
+ * \param az The new Azimuth
+ * \param el The new Elevation
+ *
+ * \note The function does not perform any range check since the GtkRotKnob
+ * should always keep its value within range.
+ */
static void set_pos (GtkRotCtrl *ctrl, gdouble az, gdouble el)
{
+ gchar *buff;
+ gchar azstr[8],elstr[8];
+ gint written,size;
+ gint status;
+ struct hostent *h;
+ struct sockaddr_in ServAddr;
+ gint sock; /*!< Network socket */
+
+ /* create socket */
+ sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+ if (sock < 0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%d: Failed to create socket"),
+ __FILE__, __LINE__);
+ return;
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s:%d Network socket created successfully"),
+ __FILE__, __LINE__);
+ }
+
+ memset(&ServAddr, 0, sizeof(ServAddr)); /* Zero out structure */
+ ServAddr.sin_family = AF_INET; /* Internet address family */
+ h = gethostbyname(ctrl->conf->host);
+ memcpy((char *) &ServAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
+ ServAddr.sin_port = htons(ctrl->conf->port); /* Server port */
+
+ /* establish connection */
+ status = connect(sock, (struct sockaddr *) &ServAddr, sizeof(ServAddr));
+ if (status < 0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%d: Failed to connect to %s:%d"),
+ __FILE__, __LINE__, ctrl->conf->host, ctrl->conf->port);
+ return;
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s:%d: Connection opened to %s:%d"),
+ __FILE__, __LINE__, ctrl->conf->host, ctrl->conf->port);
+ }
+
+ /* send command */
+ g_ascii_formatd (azstr, 8, "%7.2f", az);
+ g_ascii_formatd (elstr, 8, "%7.2f", el);
+ buff = g_strdup_printf ("P %s %s\n", azstr, elstr);
+
+ /* number of bytes to write depends on platform (EOL) */
+#ifdef G_OS_WIN32
+ size = 19;
+#else
+ size = 18;
+#endif
+ written = send(sock, buff, size, 0);
+ if (written != size) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%d: SIZE ERROR %d / %d"),
+ __FILE__, __LINE__, written, size);
+ }
+
+ g_print ("SZ:%d WR:%d AZ:%s EL:%s STR:%s", size, written, azstr, elstr, buff);
+
+ g_free (buff);
+
+ shutdown (sock, SHUT_RDWR);
+ close (sock);
+
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-16 20:38:47
|
Revision: 114
http://gpredict.svn.sourceforge.net/gpredict/?rev=114&view=rev
Author: csete
Date: 2008-09-16 20:38:57 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
Ensure that knob value is within new range when upper or lower limits are modified.
Modified Paths:
--------------
trunk/src/gtk-rot-knob.c
Modified: trunk/src/gtk-rot-knob.c
===================================================================
--- trunk/src/gtk-rot-knob.c 2008-09-16 01:31:09 UTC (rev 113)
+++ trunk/src/gtk-rot-knob.c 2008-09-16 20:38:57 UTC (rev 114)
@@ -368,8 +368,15 @@
gtk_rot_knob_set_min (GtkRotKnob *knob, gdouble min)
{
/* just som sanity check we have only 3 digits */
- if (min < 1000)
+ if (min < 1000) {
knob->min = min;
+
+ /* ensure that current value is within range */
+ if (knob->value < knob->min) {
+ knob->value = knob->min;
+ gtk_rot_knob_update (knob);
+ }
+ }
}
/** \brief Set the upper limit of the control widget
@@ -380,8 +387,15 @@
gtk_rot_knob_set_max (GtkRotKnob *knob, gdouble max)
{
/* just som sanity check we have only 3 digits */
- if (max < 1000)
+ if (max < 1000) {
knob->max = max;
+
+ /* ensure that current value is within range */
+ if (knob->value > knob->max) {
+ knob->value = knob->max;
+ gtk_rot_knob_update (knob);
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-16 01:31:01
|
Revision: 113
http://gpredict.svn.sourceforge.net/gpredict/?rev=113&view=rev
Author: csete
Date: 2008-09-16 01:31:09 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
Implemented rotator position readback
Modified Paths:
--------------
trunk/src/gtk-rot-ctrl.c
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2008-09-16 00:31:28 UTC (rev 112)
+++ trunk/src/gtk-rot-ctrl.c 2008-09-16 01:31:09 UTC (rev 113)
@@ -48,6 +48,13 @@
# include <build-config.h>
#endif
+/* NETWORK */
+//#include <sys/types.h>
+#include <sys/socket.h> /* socket(), connect(), send() */
+#include <netinet/in.h> /* struct sockaddr_in */
+#include <arpa/inet.h> /* htons() */
+#include <netdb.h> /* gethostbyname() */
+/* END */
#define FMTSTR "%7.2f\302\260"
@@ -74,6 +81,8 @@
static gboolean rot_ctrl_timeout_cb (gpointer data);
static void update_count_down (GtkRotCtrl *ctrl, gdouble t);
+static void get_pos (GtkRotCtrl *ctrl, gdouble *az, gdouble *el);
+static void set_pos (GtkRotCtrl *ctrl, gdouble az, gdouble el);
static GtkVBoxClass *parent_class = NULL;
@@ -316,13 +325,18 @@
gtk_container_add (GTK_CONTAINER (frame), table);
ctrl->AzSet = gtk_rot_knob_new (0.0, 360.0, 180.0);
- gtk_table_attach_defaults (GTK_TABLE (table), ctrl->AzSet, 1, 2, 0, 1);
+ gtk_table_attach_defaults (GTK_TABLE (table), ctrl->AzSet, 0, 2, 0, 1);
label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label), _("Read:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
+ gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
+ GTK_SHRINK, GTK_SHRINK, 10, 0);
+ ctrl->AzRead = gtk_label_new (" --- ");
+ gtk_misc_set_alignment (GTK_MISC (ctrl->AzRead), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), ctrl->AzRead, 1, 2, 1, 2);
+
return frame;
}
@@ -350,13 +364,17 @@
gtk_container_add (GTK_CONTAINER (frame), table);
ctrl->ElSet = gtk_rot_knob_new (0.0, 90.0, 45.0);
- gtk_table_attach_defaults (GTK_TABLE (table), ctrl->ElSet, 1, 2, 0, 1);
+ gtk_table_attach_defaults (GTK_TABLE (table), ctrl->ElSet, 0, 2, 0, 1);
label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label), _("Read:"));
+ gtk_label_set_markup (GTK_LABEL (label), _("Read: "));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
+ gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
+ GTK_SHRINK, GTK_SHRINK, 10, 0);
+ ctrl->ElRead = gtk_label_new (" --- ");
+ gtk_misc_set_alignment (GTK_MISC (ctrl->ElRead), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), ctrl->ElRead, 1, 2, 1, 2);
return frame;
}
@@ -544,7 +562,7 @@
gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 2, 3);
/* load initial rotator configuration */
- rot_selected_cb (ctrl->DevSel, ctrl);
+ rot_selected_cb (GTK_COMBO_BOX (ctrl->DevSel), ctrl);
frame = gtk_frame_new (_("Settings"));
gtk_container_add (GTK_CONTAINER (frame), table);
@@ -751,6 +769,9 @@
}
gtk_widget_set_sensitive (ctrl->DevSel, TRUE);
ctrl->engaged = FALSE;
+
+ gtk_label_set_text (GTK_LABEL (ctrl->AzRead), "---");
+ gtk_label_set_text (GTK_LABEL (ctrl->ElRead), "---");
}
}
@@ -763,7 +784,10 @@
rot_ctrl_timeout_cb (gpointer data)
{
GtkRotCtrl *ctrl = GTK_ROT_CTRL (data);
+ gdouble rotaz=0.0, rotel=0.0;
+ gchar *text;
+
if (ctrl->busy) {
sat_log_log (SAT_LOG_LEVEL_ERROR,_("%s missed the deadline"),__FUNCTION__);
return TRUE;
@@ -795,10 +819,21 @@
/* TODO: Update controller thread on polar plot */
}
- if (ctrl->engaged) {
+ if ((ctrl->engaged) && (ctrl->conf != NULL)) {
+
+ /* read back current value from device */
+ get_pos (ctrl, &rotaz, &rotel);
+
+ /* update display widgets */
+ text = g_strdup_printf ("%.2f\302\260", rotaz);
+ gtk_label_set_text (GTK_LABEL (ctrl->AzRead), text);
+ g_free (text);
+ text = g_strdup_printf ("%.2f\302\260", rotel);
+ gtk_label_set_text (GTK_LABEL (ctrl->ElRead), text);
+ g_free (text);
+
/* if tolerance exceeded */
/* TODO: send controller values to rotator device */
- /* TODO: read back current position from device */
/* TODO: update polar plot */
}
@@ -809,7 +844,126 @@
}
+/** \brief Read rotator position from device.
+ * \param ctrl Pointer to the GtkRotCtrl widget.
+ * \param az The current Az as read from the device
+ * \param el The current El as read from the device
+ */
+static void get_pos (GtkRotCtrl *ctrl, gdouble *az, gdouble *el)
+{
+ gchar *buff,**vbuff;
+ gint written,size;
+ gint status;
+ struct hostent *h;
+ struct sockaddr_in ServAddr;
+ gint sock; /*!< Network socket */
+
+ if ((az == NULL) || (el == NULL)) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s:%d: NULL storage."),
+ __FILE__, __LINE__);
+ return;
+ }
+
+ /* create socket */
+ sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+ if (sock < 0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%d: Failed to create socket"),
+ __FILE__, __LINE__);
+ return;
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s:%d Network socket created successfully"),
+ __FILE__, __LINE__);
+ }
+
+ memset(&ServAddr, 0, sizeof(ServAddr)); /* Zero out structure */
+ ServAddr.sin_family = AF_INET; /* Internet address family */
+ h = gethostbyname(ctrl->conf->host);
+ memcpy((char *) &ServAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
+ ServAddr.sin_port = htons(ctrl->conf->port); /* Server port */
+
+ /* establish connection */
+ status = connect(sock, (struct sockaddr *) &ServAddr, sizeof(ServAddr));
+ if (status < 0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%d: Failed to connect to %s:%d"),
+ __FILE__, __LINE__, ctrl->conf->host, ctrl->conf->port);
+ return;
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s:%d: Connection opened to %s:%d"),
+ __FILE__, __LINE__, ctrl->conf->host, ctrl->conf->port);
+ }
+
+ /* send command */
+ buff = g_strdup_printf ("p\n");
+
+ /* number of bytes to write depends on platform (EOL) */
+#ifdef G_OS_WIN32
+ size = 3;
+#else
+ size = 2;
+#endif
+ written = send(sock, buff, size, 0);
+ if (written != size) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%d: SIZE ERROR %d / %d"),
+ __FILE__, __LINE__, written, size);
+ }
+ g_free (buff);
+
+
+ /* try to read answer */
+ buff = g_try_malloc (128);
+ if (buff == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%s: Failed to allocate 128 bytes (yes, this means trouble)"),
+ __FILE__, __FUNCTION__);
+ shutdown (sock, SHUT_RDWR);
+ close (sock);
+ return;
+ }
+
+ size = read (sock, buff, 127);
+ if (size == 0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%s: Got 0 bytes from rotctld"),
+ __FILE__, __FUNCTION__);
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s:%s: Read %d bytes from rotctld"),
+ __FILE__, __FUNCTION__, size);
+
+ buff[size] = 0;
+ vbuff = g_strsplit (buff, "\n", 3);
+ *az = g_strtod (vbuff[0], NULL);
+ *el = g_strtod (vbuff[1], NULL);
+
+ g_free (buff);
+ g_strfreev (vbuff);
+ }
+
+ shutdown (sock, SHUT_RDWR);
+ close (sock);
+
+
+}
+
+
+static void set_pos (GtkRotCtrl *ctrl, gdouble az, gdouble el)
+{
+
+}
+
+
+
+
/** \brief Update count down label.
* \param[in] ctrl Pointer to the RotCtrl widget.
* \param[in] t The current time.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-16 00:31:18
|
Revision: 112
http://gpredict.svn.sourceforge.net/gpredict/?rev=112&view=rev
Author: csete
Date: 2008-09-16 00:31:28 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
Shutdown socket after use (before close).
Modified Paths:
--------------
trunk/src/gtk-rig-ctrl.c
Modified: trunk/src/gtk-rig-ctrl.c
===================================================================
--- trunk/src/gtk-rig-ctrl.c 2008-09-15 23:30:05 UTC (rev 111)
+++ trunk/src/gtk-rig-ctrl.c 2008-09-16 00:31:28 UTC (rev 112)
@@ -847,6 +847,7 @@
__FUNCTION__, written, size);
}
g_free (buff);
+ shutdown (sock, SHUT_RDWR);
close (sock);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-15 23:29:54
|
Revision: 111
http://gpredict.svn.sourceforge.net/gpredict/?rev=111&view=rev
Author: csete
Date: 2008-09-15 23:30:05 +0000 (Mon, 15 Sep 2008)
Log Message:
-----------
Log an error message if trying to engage invalid configuration.
Modified Paths:
--------------
trunk/src/gtk-rig-ctrl.c
Modified: trunk/src/gtk-rig-ctrl.c
===================================================================
--- trunk/src/gtk-rig-ctrl.c 2008-09-15 23:29:11 UTC (rev 110)
+++ trunk/src/gtk-rig-ctrl.c 2008-09-15 23:30:05 UTC (rev 111)
@@ -722,6 +722,9 @@
else {
if (ctrl->conf == NULL) {
/* we don't have a working configuration */
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Controller does not have a valid configuration"),
+ __FUNCTION__);
return;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-15 23:28:59
|
Revision: 110
http://gpredict.svn.sourceforge.net/gpredict/?rev=110&view=rev
Author: csete
Date: 2008-09-15 23:29:11 +0000 (Mon, 15 Sep 2008)
Log Message:
-----------
Added check to ensure that we have a proper device configuration before engaging.
Modified Paths:
--------------
trunk/src/gtk-rot-ctrl.c
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2008-09-15 23:26:11 UTC (rev 109)
+++ trunk/src/gtk-rot-ctrl.c 2008-09-15 23:29:11 UTC (rev 110)
@@ -742,6 +742,13 @@
ctrl->engaged = TRUE;
}
else {
+ if (ctrl->conf == NULL) {
+ /* we don't have a working configuration */
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Controller does not have a valid configuration"),
+ __FUNCTION__);
+ return;
+ }
gtk_widget_set_sensitive (ctrl->DevSel, TRUE);
ctrl->engaged = FALSE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-15 23:26:00
|
Revision: 109
http://gpredict.svn.sourceforge.net/gpredict/?rev=109&view=rev
Author: csete
Date: 2008-09-15 23:26:11 +0000 (Mon, 15 Sep 2008)
Log Message:
-----------
Implemented loading of rotator configuration.
Modified Paths:
--------------
trunk/src/gtk-rot-ctrl.c
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2008-09-15 23:19:31 UTC (rev 108)
+++ trunk/src/gtk-rot-ctrl.c 2008-09-15 23:26:11 UTC (rev 109)
@@ -495,7 +495,7 @@
gtk_combo_box_set_active (GTK_COMBO_BOX (ctrl->DevSel), 0);
g_signal_connect (ctrl->DevSel, "changed", G_CALLBACK (rot_selected_cb), ctrl);
gtk_table_attach_defaults (GTK_TABLE (table), ctrl->DevSel, 1, 2, 0, 1);
-
+
/* Engage button */
lock = gtk_toggle_button_new_with_label (_("Engage"));
gtk_widget_set_tooltip_text (lock, _("Engage the selcted rotor device"));
@@ -543,6 +543,8 @@
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 2, 3);
+ /* load initial rotator configuration */
+ rot_selected_cb (ctrl->DevSel, ctrl);
frame = gtk_frame_new (_("Settings"));
gtk_container_add (GTK_CONTAINER (frame), table);
@@ -688,9 +690,39 @@
{
GtkRotCtrl *ctrl = GTK_ROT_CTRL (data);
- /* TODO: update device */
+ /* free previous configuration */
+ if (ctrl->conf != NULL) {
+ g_free (ctrl->conf->name);
+ g_free (ctrl->conf->host);
+ g_free (ctrl->conf);
+ }
- /* TODO: update ranges */
+ ctrl->conf = g_try_new (rotor_conf_t, 1);
+ if (ctrl->conf == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%d: Failed to allocate memory for rotator config"),
+ __FILE__, __LINE__);
+ return;
+ }
+
+ /* load new configuration */
+ ctrl->conf->name = gtk_combo_box_get_active_text (box);
+ if (rotor_conf_read (ctrl->conf)) {
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("Loaded new rotator configuration %s"),
+ ctrl->conf->name);
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%d: Failed to load rotator configuration %s"),
+ __FILE__, __LINE__, ctrl->conf->name);
+
+ g_free (ctrl->conf->name);
+ if (ctrl->conf->host)
+ g_free (ctrl->conf->host);
+ g_free (ctrl->conf);
+ ctrl->conf = NULL;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
