Changeset 10685 for ossiedev/branches/jgaeddert/0.8.0/components

Timestamp:

04/15/11 16:20:25 (2 years ago)

Author:

jgaeddert

Message:

FrameSync?64: adding squelch_enabled and squelch_threshold properties

Location:

ossiedev/branches/jgaeddert/0.8.0/components

Files:

• src/FrameSync64.cpp (modified) (1 diff)
• xml/FrameSync64.prf.xml (modified) (2 diffs)

ossiedev/branches/jgaeddert/0.8.0/components/src/FrameSync64.cpp

@@ -159 +159 @@
     std::cout << "props length : " << props.length() << std::endl;
 
-    for ( unsigned int i = 0; i <props.length(); i++)
-    {
+    for ( unsigned int i = 0; i <props.length(); i++) {
         std::cout << "Property id : " << props[i].id << std::endl;
 
         if (strcmp(props[i].id, "DCE:0a3620cc-0aa1-11df-baab-001aa089d644") == 0) {
             // verbose
-            CORBA::Boolean tmp;
-            props[i].value >>= tmp;
-            verbose = tmp;
+            props[i].value >>= verbose;
+        } else if (strcmp(props[i].id, "DCE:5b2083b8-fac1-4ed9-becf-80ca7ab08329") == 0) {
+            // squelch_enabled
+            CORBA::Boolean simple_tmp;
+            props[i].value >>= simple_tmp;
+            fsprops.squelch_enabled = (simple_tmp == false) ? 0 : 1;
+            framesync64_setprops(fs,&fsprops);
+        } else if (strcmp(props[i].id, "DCE:f6729dae-185f-4438-9202-6adaff95e20e") == 0) {
+            // squelch_threshold
+            props[i].value >>= fsprops.squelch_threshold;
+            framesync64_setprops(fs,&fsprops);
+        } else {
+            fprintf(stderr,"error: FrameSync64::configure(), invalid property\n");
+            throw (0);
         }
     }

ossiedev/branches/jgaeddert/0.8.0/components/xml/FrameSync64.prf.xml

@@ -5 +5 @@
 <properties>
     <description>These are the properties to configure the device manager</description> 
+
     <simple id="DCE:0a3620cc-0aa1-11df-baab-001aa089d644" mode="readwrite" name="verbose" type="boolean">
         <value>0</value> 
@@ -10 +11 @@
         <kind kindtype="configure"/>
     </simple>
+
+    <simple id="DCE:5b2083b8-fac1-4ed9-becf-80ca7ab08329" mode="readwrite" name="squelch_enabled" type="boolean">
+        <value>1</value> 
+        <description>enable/disable squelch control (ignore signals below threshold)</description> 
+        <kind kindtype="configure"/>
+    </simple>
+
+    <simple id="DCE:f6729dae-185f-4438-9202-6adaff95e20e" mode="readwrite" name="squelch_threshold" type="float">
+        <value>-30.0</value> 
+        <description>AGC squelch threshold (noise floor) in dB</description> 
+        <kind kindtype="configure"/>
+    </simple>
 </properties>