[Gpredict-svn] SF.net SVN: gpredict:[205] trunk/src

[<cs...@us...>]

Revision: 205
          http://gpredict.svn.sourceforge.net/gpredict/?rev=205&view=rev
Author:   csete
Date:     2009-03-21 10:06:23 +0000 (Sat, 21 Mar 2009)

Log Message:
-----------
Added config field for uplink transverterf LO.

Modified Paths:
--------------
    trunk/src/radio-conf.c
    trunk/src/radio-conf.h

Modified: trunk/src/radio-conf.c
===================================================================
--- trunk/src/radio-conf.c	2009-03-21 10:03:32 UTC (rev 204)
+++ trunk/src/radio-conf.c	2009-03-21 10:06:23 UTC (rev 205)
@@ -38,6 +38,7 @@
 #define KEY_HOST        "Host"
 #define KEY_PORT        "Port"
 #define KEY_LO          "LO"
+#define KEY_LOUP        "LO_UP"
 #define KEY_TYPE        "Type"
 #define KEY_PTT         "READ_PTT"
 
@@ -118,6 +119,16 @@
         g_key_file_free (cfg);
         return FALSE;
     }
+    
+    conf->loup = g_key_file_get_double (cfg, GROUP, KEY_LOUP, &error);
+    if (error != NULL) {
+        sat_log_log (SAT_LOG_LEVEL_ERROR,
+                     _("%s: Error reading radio conf from %s (%s)."),
+                       __FUNCTION__, conf->name, error->message);
+        g_clear_error (&error);
+        g_key_file_free (cfg);
+        return FALSE;
+    }
 
     conf->type = g_key_file_get_integer (cfg, GROUP, KEY_TYPE, &error);
     if (error != NULL) {
@@ -177,6 +188,7 @@
     g_key_file_set_string (cfg, GROUP, KEY_HOST, conf->host);
     g_key_file_set_integer (cfg, GROUP, KEY_PORT, conf->port);
     g_key_file_set_double (cfg, GROUP, KEY_LO, conf->lo);
+    g_key_file_set_double (cfg, GROUP, KEY_LO, conf->loup);
     g_key_file_set_integer (cfg, GROUP, KEY_TYPE, conf->type);
     g_key_file_set_boolean (cfg, GROUP, KEY_PTT, conf->ptt);
     

Modified: trunk/src/radio-conf.h
===================================================================
--- trunk/src/radio-conf.h	2009-03-21 10:03:32 UTC (rev 204)
+++ trunk/src/radio-conf.h	2009-03-21 10:06:23 UTC (rev 205)
@@ -48,7 +48,8 @@
     gchar       *host;      /*!< hostname or IP */
     gint         port;      /*!< port number */
     gdouble      lo;        /*!< local oscillator freq in Hz (using double for
-                                 compatibility with rest of code) */
+                                 compatibility with rest of code). Downlink. */
+    gdouble      loup;      /*!< local oscillator freq in Hz for uplink. */
     rig_type_t   type;      /*!< Radio type */
     gboolean     ptt;       /*!< Flag indicating that we should read PTT status (needed for RX, TX, and TRX) */
 } radio_conf_t;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.