Changeset 8831

Timestamp:

03/02/09 14:48:22 (4 years ago)

Author:

hvolos

Message:

remove metadata, add frame size properties

Location:

ossiedev/branches/hvolos/packetwfrm/components/FrameAssembler

Files:

• Makefile.am (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• documentation.txt (modified) (2 diffs)
• src/FrameAssembler.cpp (modified) (16 diffs)
• src/FrameAssembler.h (modified) (6 diffs)
• src/FrameAssemblerDSP.cpp (modified) (5 diffs)
• src/FrameAssemblerDSP.h (modified) (3 diffs)
• src/main.cpp (modified) (4 diffs)
• xml/FrameAssembler.prf.xml (modified) (1 diff)
• xml/FrameAssembler.spd.xml (modified) (2 diffs)

ossiedev/branches/hvolos/packetwfrm/components/FrameAssembler/Makefile.am

@@ -1 +1 @@
 AM_CXXFLAGS = -Wall 
 
-bin_PROGRAMS = FrameAssembler_metadata
+bin_PROGRAMS = FrameAssembler
 bindir = $(prefix)/bin
 
-# ---------- FrameAssembler_metadata ----------
+# ---------- FrameAssembler ----------
 
-FrameAssembler_metadata_SOURCES =                \
-    src/FrameAssembler_metadata.cpp              \
+FrameAssembler_SOURCES =                \
+    src/FrameAssembler.cpp              \
     src/FrameAssemblerDSP.cpp           \
     src/PNCodes.cpp                     \
     src/main.cpp
 
-ossieName1 = FrameAssembler_metadata
+ossieName1 = FrameAssembler
 xml1dir = $(prefix)/xml/$(ossieName1)
 dist_xml1_DATA =                        \
-    xml/FrameAssembler_metadata.prf.xml          \
-    xml/FrameAssembler_metadata.scd.xml          \
-    xml/FrameAssembler_metadata.spd.xml 
+    xml/FrameAssembler.prf.xml          \
+    xml/FrameAssembler.scd.xml          \
+    xml/FrameAssembler.spd.xml 
 
 # ---------- autotest ----------
@@ -31 +31 @@
 cxxtest:
         cxxtestgen.py --error-printer -o autotest.cpp   \
-        atsrc/FrameAssembler_metadata_testsuite.h
+        atsrc/FrameAssembler_testsuite.h
 
 # ---------- documentation ---------

ossiedev/branches/hvolos/packetwfrm/components/FrameAssembler/configure.ac

@@ -1 @@
-AC_INIT(FrameAssembler_metadata, 0.7.0)
+AC_INIT(FrameAssembler, 0.7.0)
 AM_INIT_AUTOMAKE
 

ossiedev/branches/hvolos/packetwfrm/components/FrameAssembler/documentation.txt

@@ -3 +3 @@
 Copyright 2007 Virginia Polytechnic Institute and State University
 
-This file is part of the OSSIE FrameAssembler_metadata.
+This file is part of the OSSIE FrameAssembler.
 
-OSSIE FrameAssembler_metadata is free software; you can redistribute it and/or modify
+OSSIE FrameAssembler is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
-OSSIE FrameAssembler_metadata is distributed in the hope that it will be useful,
+OSSIE FrameAssembler is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -16 +16 @@
 
 You should have received a copy of the GNU General Public License
-along with OSSIE FrameAssembler_metadata; if not, write to the Free Software
+along with OSSIE FrameAssembler; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 

ossiedev/branches/hvolos/packetwfrm/components/FrameAssembler/src/FrameAssembler.cpp

@@ -3 +3 @@
 Copyright 2007 Virginia Polytechnic Institute and State University
 
-This file is part of the OSSIE FrameAssembler_metadata.
-
-OSSIE FrameAssembler_metadata is free software; you can redistribute it and/or modify
+This file is part of the OSSIE FrameAssembler.
+
+OSSIE FrameAssembler is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
-OSSIE FrameAssembler_metadata is distributed in the hope that it will be useful,
+OSSIE FrameAssembler is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -16 +16 @@
 
 You should have received a copy of the GNU General Public License
-along with OSSIE FrameAssembler_metadata; if not, write to the Free Software
+along with OSSIE FrameAssembler; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
@@ -24 +24 @@
 #include <string>
 #include <iostream>
-#include "FrameAssembler_metadata.h"
-
-FrameAssembler_metadata_i::FrameAssembler_metadata_i(const char *uuid, omni_condition *condition) : 
+#include "FrameAssembler.h"
+
+FrameAssembler_i::FrameAssembler_i(const char *uuid, omni_condition *condition) : 
     Resource_impl(uuid), component_running(condition)
 {
@@ -32 +32 @@
     dataOut_0 = new standardInterfaces_i::complexShort_u("FrameSymbolsOut");
 
-    num_frames_sent_app_1 = 0;
-    num_frames_sent_app_2 = 0;
-    num_frames_sent_app_5 = 0;
-    num_frames_sent_app_6 = 0;
+    frame_size_option=1;
 
     //Create the thread for the writer's processing function 
@@ -45 +42 @@
 }
 
-FrameAssembler_metadata_i::~FrameAssembler_metadata_i(void)
+FrameAssembler_i::~FrameAssembler_i(void)
 {   
     delete dataIn_0;
@@ -52 +49 @@
 
 // Static function for omni thread
-void FrameAssembler_metadata_i::Run( void * data )
-{
-    ((FrameAssembler_metadata_i*)data)->ProcessData();
-}
-
-CORBA::Object_ptr FrameAssembler_metadata_i::getPort( const char* portName ) throw (
+void FrameAssembler_i::Run( void * data )
+{
+    ((FrameAssembler_i*)data)->ProcessData();
+}
+
+CORBA::Object_ptr FrameAssembler_i::getPort( const char* portName ) throw (
     CORBA::SystemException, CF::PortSupplier::UnknownPort)
 {
-    DEBUG(3, FrameAssembler_metadata, "getPort() invoked with " << portName)
+    DEBUG(3, FrameAssembler, "getPort() invoked with " << portName)
     
     CORBA::Object_var p;
@@ -78 +75 @@
 }
 
-void FrameAssembler_metadata_i::start() throw (CORBA::SystemException, 
+void FrameAssembler_i::start() throw (CORBA::SystemException, 
     CF::Resource::StartError)
 {
-    DEBUG(3, FrameAssembler_metadata, "start() invoked")
-}
-
-void FrameAssembler_metadata_i::stop() throw (CORBA::SystemException, CF::Resource::StopError) 
+    DEBUG(3, FrameAssembler, "start() invoked")
+}
+
+void FrameAssembler_i::stop() throw (CORBA::SystemException, CF::Resource::StopError) 
 {  
-    DEBUG(3, FrameAssembler_metadata, "stop() invoked")
-}
-
-void FrameAssembler_metadata_i::releaseObject() throw (CORBA::SystemException,
+    DEBUG(3, FrameAssembler, "stop() invoked")
+}
+
+void FrameAssembler_i::releaseObject() throw (CORBA::SystemException,
     CF::LifeCycle::ReleaseError)
 {
-    DEBUG(3, FrameAssembler_metadata, "releaseObject() invoked")
+    DEBUG(3, FrameAssembler, "releaseObject() invoked")
     
     component_running->signal();
 }
 
-void FrameAssembler_metadata_i::initialize() throw (CF::LifeCycle::InitializeError,
+void FrameAssembler_i::initialize() throw (CF::LifeCycle::InitializeError,
     CORBA::SystemException)
 {
-    DEBUG(3, FrameAssembler_metadata, "initialize() invoked")
-}
-
-void FrameAssembler_metadata_i::configure(const CF::Properties& props)
+    DEBUG(3, FrameAssembler, "initialize() invoked")
+}
+
+void FrameAssembler_i::configure(const CF::Properties& props)
 throw (CORBA::SystemException,
     CF::PropertySet::InvalidConfiguration,
     CF::PropertySet::PartialConfiguration)
 {
-    DEBUG(3, FrameAssembler_metadata, "configure() invoked")
+    DEBUG(3, FrameAssembler, "configure() invoked")
     
     std::cout << "props length : " << props.length() << std::endl;
@@ -115 +112 @@
         std::cout << "Property id : " << props[i].id << std::endl;
 
-        if (strcmp(props[i].id, "DCE:c15e70e4-96e4-4cc8-b1f0-06cb301f6c2e") == 0) {
+        if (strcmp(props[i].id, "DCE:a15e70e4-96e4-4cc8-b1f0-06cb301f6c2e") == 0) {
             // Modulation type
             const char * prop_str;
@@ -133 +130 @@
             } else {
                 // unknown property
-                std::cerr << "ERROR: FrameAssembler_metadata::configure() unknown mod. scheme "
+                std::cerr << "ERROR: FrameAssembler::configure() unknown mod. scheme "
                           << prop_str << std::endl;
                 throw CF::PropertySet::InvalidConfiguration();
             }
-            ///\todo catch exception thrown by FrameAssembler_metadataDSP::ConfigureModulationScheme()
-
-        } else if (strcmp(props[i].id, "DCE:06b798ba-5412-4bbe-bf0b-8ca665d25b83") == 0) {
+            ///\todo catch exception thrown by FrameAssemblerDSP::ConfigureModulationScheme()
+
+        } else if (strcmp(props[i].id, "DCE:96b798ba-5412-4bbe-bf0b-8ca665d25b83") == 0) {
             // Frame size
             CORBA::UShort simple_temp;
             props[i].value >>= simple_temp;
-
-            ConfigureFrameSize(simple_temp);
+            frame_size_option=simple_temp;
+            ConfigureFrameSize(frame_size_option);
+            DEBUG(3, FrameAssembler, "Frame Size Option "<<frame_size_option<<" read and configured")
+        } else if (strcmp(props[i].id, "DCE:cdac2d50-214c-4c47-8a6d-d9ec453b3b3c") == 0) {
+            CORBA::UShort simple_temp;
+            props[i].value >>= simple_temp;
+            SetFrameSize(simple_temp,1);           
+        } else if (strcmp(props[i].id, "DCE:a6caa288-08d2-4f0e-b0f0-f34fa513ce3d") == 0) {
+            CORBA::UShort simple_temp;
+            props[i].value >>= simple_temp;
+            SetFrameSize(simple_temp,2);
+        } else if (strcmp(props[i].id, "DCE:bcf3ff9b-9f9d-4498-b29a-78f813678271") == 0) {
+            CORBA::UShort simple_temp;
+            props[i].value >>= simple_temp;
+            SetFrameSize(simple_temp,3);
+        } else if (strcmp(props[i].id, "DCE:34311a06-2055-4490-a949-478786cad4d4") == 0) {
+            CORBA::UShort simple_temp;
+            props[i].value >>= simple_temp;
+            SetFrameSize(simple_temp,4);
 
         } else {
             // unknown property
-            std::cerr << "ERROR: FrameAssembler_metadata::configure() unknown property" << std::endl;
+            std::cerr << "ERROR: FrameAssembler::configure() unknown property" << std::endl;
             throw CF::PropertySet::InvalidConfiguration();
         }
     }
-
-}
-
-void FrameAssembler_metadata_i::ConfigureModulationSchemeOnMetaData() {
-    switch (metadata->modulation_scheme.scheme) {
-    case standardInterfaces::ModulationScheme::PSK:
-        switch (metadata->modulation_scheme.M) {
-        case 2:
-            ConfigureModulationScheme(SigProc::BPSK);
-            DEBUG(5, FrameAssembler_metadata, "Frame mod set to BPSK");
-            break;
-        case 4:
-            ConfigureModulationScheme(SigProc::QPSK);
-            DEBUG(5, FrameAssembler_metadata, "Frame mod set to QPSK");
-            break;
-        case 8:
-            ConfigureModulationScheme(SigProc::PSK8);
-            DEBUG(5, FrameAssembler_metadata, "Frame mod set to 8PSK");
-            break;
-        default:
-            std::cerr << "FrameAssembler_metadata-metadata: Unsupported PSK modulation depth" << std::endl;
-            throw 0;
-        }
-        break;
-    case standardInterfaces::ModulationScheme::QAM:
-        switch (metadata->modulation_scheme.M) {
-        case 4:
-            ConfigureModulationScheme(SigProc::QPSK);
-            DEBUG(5, FrameAssembler_metadata, "Frame mod set to QPSK (4QAM)");
-            break;
-        case 16:
-            ConfigureModulationScheme(SigProc::QAM16);
-            DEBUG(5, FrameAssembler_metadata, "Frame mod set to 16QAM");
-            break;
-        default:
-            std::cerr << "FrameAssembler_metadata-metadata: Unsupported QAM modulation depth" << std::endl;
-            throw 0;
-        }
-        break;
-    case standardInterfaces::ModulationScheme::PAM:
-        switch (metadata->modulation_scheme.M) {
-        case 4:
-            ConfigureModulationScheme(SigProc::PAM4);
-            DEBUG(5, FrameAssembler_metadata, "Frame mod set to 4PAM");
-            break;
-        default:
-            std::cerr << "FrameAssembler_metadata-metadata: Unsupported PAM modulation depth" << std::endl;
-            throw 0;
-        }
-        break;
-    case standardInterfaces::ModulationScheme::UNKNOWN:
-    default:;
-    }
-}
-
-
-
-
-void FrameAssembler_metadata_i::ProcessData()
-{
-    DEBUG(3, FrameAssembler_metadata, "ProcessData() invoked")
+    
+    //Update frame size
+    ConfigureFrameSize(frame_size_option);
+    DEBUG(3, FrameAssembler, "Frame Size Option "<<frame_size_option<<" configured")
+
+}
+
+
+
+void FrameAssembler_i::ProcessData()
+{
+    DEBUG(3, FrameAssembler, "ProcessData() invoked")
 
     PortTypes::ShortSequence I_out_header, Q_out_header;
@@ -270 +235 @@
         while ( numFrameSymbolsAssembled < (frameSize-1) ) {
             // Get data from port
-            //dataIn_0->getData(I_in_0, Q_in_0, metadata);
             dataIn_0->getData(I_in_0, Q_in_0);
             // Read input data length
             N_in = I_in_0->length();
-            DEBUG(1, FrameAssembler_metadata, "got " << N_in << " samples");
+            DEBUG(1, FrameAssembler, "got " << N_in << " samples");
 
 
 /* HV
-            if (metadata->app_id==0) {
-                // control packet; configure
-                DEBUG(1, FrameAssembler_metadata, "configuring end-of-frame control (app_id = 0)");
-                if (N_in != 1024) {
-                    std::cerr << "ERROR! FrameAssembler_metadata: control packet is wrong length!"
-                              << std::endl;
-                    throw 0;
-                }
 
                 for (unsigned int i=0; i<N_in; i++) {
@@ -298 +254 @@
             if ( numFrameSymbolsAssembled==0 ) {
                 // first packet
-                ConfigureModulationScheme(SigProc::QPSK);
+                //ConfigureModulationScheme(SigProc::QPSK);
                 
-                /* HV
-                ConfigureModulationSchemeOnMetaData();
-
-                if (metadata->app_id==5) {
-                    DEBUG(1, FrameAssembler_metadata, "configuring special control frame (app_id = 5)");
-                    ConfigureFrameType(FRAME_TYPE_CONTROL);
-                    // control frame
-                    if (N_in != frameSize) {
-                        std::cerr << "ERROR! FrameAssembler_metadata: control packet (app_id=5) is wrong length!"
-                                  << std::endl;
-                        throw 0;
-                    }
-                    num_frames_sent_app_5++;
-                } else if (metadata->app_id==6) {
-                    DEBUG(1, FrameAssembler_metadata, "configuring special beacon frame (app_id = 6)");
-                    ConfigureFrameType(FRAME_TYPE_CONTROL);
-                    // control frame
-                    if (N_in != frameSize) {
-                        std::cerr << "ERROR! FrameAssembler_metadata: control packet (app_id=6) is wrong length!"
-                                  << std::endl;
-                        throw 0;
-                    }
-                    num_frames_sent_app_6++;
-                } else if (metadata->app_id==1) {
-                    // audio data
-                    ConfigureFrameType(FRAME_TYPE_DATA);
-                    ///todo configure for BPSK
-                    if (metadata->modulation_scheme.M == 4)
-                        ConfigureFrameSize(8192);   // QPSK
-                    else
-                        ConfigureFrameSize(4096);   // 16-QAM
-                    num_frames_sent_app_1++;
-                } else if (metadata->app_id==2) {
-                    // text data
-                    ConfigureFrameType(FRAME_TYPE_DATA);
-                    ConfigureFrameSize(512);
-                    num_frames_sent_app_2++;
-                } else {
-                    std::cerr << "ERROR! FrameAssembler_metadata: Unknown app_id: "
-                              << metadata->app_id << std::endl;
-                    throw 0;
-                }
-                */
-                
-                 //HV audio data
+
                  ConfigureFrameType(FRAME_TYPE_DATA);
-                ///todo configure for BPSK
-                 //if (metadata->modulation_scheme.M == 4)
-                   //     ConfigureFrameSize(8192);   // QPSK
-                    //else
-                        ConfigureFrameSize(4096);   // 16-QAM
-                    num_frames_sent_app_1++;
+
+                ConfigureFrameSize(frame_size_option);
+                    
 
                 I_out_data.length(frameSize);
@@ -357 +266 @@
             }
 
-            DEBUG(1, FrameAssembler_metadata, "Assembling " << N_in << " symbols (max: " << frameSize);
+            DEBUG(1, FrameAssembler, "Assembling " << N_in << " symbols (max: " << frameSize);
 
             for (unsigned int i=0; i<N_in; i++) {
@@ -373 +282 @@
 
         // ASSEMBLE_PREAMBLE
-        DEBUG(4, FrameAssembler_metadata, "Assembling preamble")
- //HV       metadata->port_id = 0;
+        DEBUG(4, FrameAssembler, "Assembling preamble")
+
 
         // push ramp-up preamble phasing pattern
-        DEBUG(7, FrameAssembler_metadata, "pushing ramp up phasing " << I_out_ramp_up.length() << " frame samples")
-//        dataOut_0->pushPacket(I_out_ramp_up, Q_out_ramp_up, *metadata);
+        DEBUG(7, FrameAssembler, "pushing ramp up phasing " << I_out_ramp_up.length() << " frame samples")
         dataOut_0->pushPacket(I_out_ramp_up, Q_out_ramp_up);
 
         // push preamble
         unsigned int phasing_pattern_length;
-        /* HV
-        if (metadata->app_id==6)
-            phasing_pattern_length = 16;
-        else if (metadata->app_id==1)
-            phasing_pattern_length = 32;
-        else if (metadata->app_id==0)
-            phasing_pattern_length = 8;
-        else if (metadata->app_id==5)
-            phasing_pattern_length = 32;
-        else
-            phasing_pattern_length = 8;
-            */
             
-            phasing_pattern_length = 32;
+         phasing_pattern_length = 32;
 
         for (unsigned int i=0; i<phasing_pattern_length; i++) {
-            DEBUG(7, FrameAssembler_metadata, "pushing phasing " << I_out_phasing_pattern.length() << " frame samples")
-            //dataOut_0->pushPacket(I_out_phasing_pattern, Q_out_phasing_pattern, *metadata);
+            DEBUG(7, FrameAssembler, "pushing phasing " << I_out_phasing_pattern.length() << " frame samples")
             dataOut_0->pushPacket(I_out_phasing_pattern, Q_out_phasing_pattern);
         }
 
         // ASSEMBLE_HEADER
-        DEBUG(4, FrameAssembler_metadata, "Assembling header")
+        DEBUG(4, FrameAssembler, "Assembling header")
         // copy header
         I_out_header.length(512);
@@ -416 +311 @@
 
         // push data
-        DEBUG(7, FrameAssembler_metadata, "pushing header " << I_out_header.length() << " frame samples")
-        //dataOut_0->pushPacket(I_out_header, Q_out_header, *metadata);
+        DEBUG(7, FrameAssembler, "pushing header " << I_out_header.length() << " frame samples")
+
         dataOut_0->pushPacket(I_out_header, Q_out_header);
 
@@ -436 +331 @@
                 I_out_0.length(j);
                 Q_out_0.length(j);
-                DEBUG(7, FrameAssembler_metadata, "pushing frame " << I_out_0.length() << " frame samples")
-                //dataOut_0->pushPacket(I_out_0, Q_out_0, *metadata);
+                DEBUG(7, FrameAssembler, "pushing frame " << I_out_0.length() << " frame samples")
                 dataOut_0->pushPacket(I_out_0, Q_out_0);
                 j=0;
@@ -449 +343 @@
             // No need to push additional control information as internal frame data
             // are already control
-            DEBUG(7, FrameAssembler_metadata, "pushing control " << I_out_control.length() << " frame samples")
-      //HV      metadata->port_id = 1;//127;
-            //dataOut_0->pushPacket(I_out_control, Q_out_control, *metadata);
-      //HV no EOM      dataOut_0->pushPacket(I_out_control, Q_out_control);
-      //HV      metadata->port_id = 0;
+            DEBUG(7, FrameAssembler, "pushing control " << I_out_control.length() << " frame samples")
+
+      //no EOM      dataOut_0->pushPacket(I_out_control, Q_out_control);
+
         }
 
         // push ramp-down phasing pattern
-        DEBUG(7, FrameAssembler_metadata, "pushing ramp down phasing " << I_out_ramp_up.length() << " frame samples")
-//        dataOut_0->pushPacket(I_out_ramp_down, Q_out_ramp_down, *metadata);
+        DEBUG(7, FrameAssembler, "pushing ramp down phasing " << I_out_ramp_up.length() << " frame samples")
+
         dataOut_0->pushPacket(I_out_ramp_down, Q_out_ramp_down);
 
-        if (ossieDebugLevel >= 4) {
-            std::cout << "Frame count:  "
-                      << "app_1(" << num_frames_sent_app_1 << ")  "
-                      << "app_2(" << num_frames_sent_app_2 << ")  "
-                      << "app_5(" << num_frames_sent_app_5 << ")  "
-                      << "app_6(" << num_frames_sent_app_6 << ")  "
-                      << "total: " << num_frames_sent_app_1+num_frames_sent_app_2
-                      << std::endl;
-        }
     }
 

ossiedev/branches/hvolos/packetwfrm/components/FrameAssembler/src/FrameAssembler.h

@@ -3 +3 @@
 Copyright 2007 Virginia Polytechnic Institute and State University
 
-This file is part of the OSSIE FrameAssembler_metadata.
+This file is part of the OSSIE FrameAssembler.
 
-OSSIE FrameAssembler_metadata is free software; you can redistribute it and/or modify
+OSSIE FrameAssembler is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
-OSSIE FrameAssembler_metadata is distributed in the hope that it will be useful,
+OSSIE FrameAssembler is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -16 +16 @@
 
 You should have received a copy of the GNU General Public License
-along with OSSIE FrameAssembler_metadata; if not, write to the Free Software
+along with OSSIE FrameAssembler; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
@@ -22 +22 @@
 
 
-#ifndef FRAMEASSEMBLER_METADATA_IMPL_H
-#define FRAMEASSEMBLER_METADATA_IMPL_H
+#ifndef FRAMEASSEMBLER_IMPL_H
+#define FRAMEASSEMBLER_IMPL_H
 
 #include <stdlib.h>
@@ -40 +40 @@
  *
  */
-class FrameAssembler_metadata_i : public virtual Resource_impl, public FrameAssemblerDSP
+class FrameAssembler_i : public virtual Resource_impl, public FrameAssemblerDSP
 {
   public:
     /// Initializing constructor
-    FrameAssembler_metadata_i(const char *uuid, omni_condition *sem);
+    FrameAssembler_i(const char *uuid, omni_condition *sem);
 
     /// Destructor
-    ~FrameAssembler_metadata_i(void);
+    ~FrameAssembler_i(void);
 
     /// Static function for omni thread
@@ -77 +77 @@
   private:
     /// Disallow default constructor
-    FrameAssembler_metadata_i();
+    FrameAssembler_i();
 
     /// Disallow copy constructor
-    FrameAssembler_metadata_i(FrameAssembler_metadata_i&);
+    FrameAssembler_i(FrameAssembler_i&);
 
     /// Main signal processing method
@@ -93 +93 @@
     standardInterfaces_i::complexShort_p *dataIn_0;
     standardInterfaces_i::complexShort_u *dataOut_0;
-    standardInterfaces::MetaData *metadata;
 
-    unsigned int num_frames_sent_app_1;
-    unsigned int num_frames_sent_app_2;
-    unsigned int num_frames_sent_app_5;
-    unsigned int num_frames_sent_app_6;
+    unsigned int frame_size_option;
+    
+    //unsigned int numFrameSymbolsAssembled;
+    
+    
 
 };

ossiedev/branches/hvolos/packetwfrm/components/FrameAssembler/src/FrameAssemblerDSP.cpp

@@ -38 +38 @@
         controlBlock[i] = pnControlCode;
 
+    numFrameSymbolsAssembled = 0;
+    
+    FRAME_SIZE_1=512;            ///< Frame size option 1
+    FRAME_SIZE_2=2048;           ///< Frame size option 2
+    FRAME_SIZE_3=4096;           ///< Frame size option 3
+    FRAME_SIZE_4=8192;           ///< Frame size option 4
+    
     ConfigureModulationScheme( BPSK );
-    ConfigureFrameSize( FRAME_SIZE_1 );
+    ConfigureFrameSize(1);
     ConfigureFrameType( FRAME_TYPE_DATA );
-
-    numFrameSymbolsAssembled = 0;
 }
 
@@ -101 +106 @@
         controlBlock[6] = pnControlCode;    // 1
         frameType = FRAME_TYPE_CONTROL;
-        ConfigureFrameSize(512);
+        ConfigureFrameSize(1);
         break;
     default:
@@ -116 +121 @@
 void FrameAssemblerDSP::ConfigureFrameSize(unsigned int _fs)
 {
-    switch (_fs) {
-    case FRAME_SIZE_1:
+    switch (_fs){
+    case 1:
         frameSize = FRAME_SIZE_1;
         controlBlock[3] = pnControlCodeInv;
         controlBlock[4] = pnControlCodeInv;
-        break;
-    case FRAME_SIZE_2:
+        break;
+    case 2:
         frameSize = FRAME_SIZE_2;
         controlBlock[3] = pnControlCodeInv;
         controlBlock[4] = pnControlCode;
-        break;
-    case FRAME_SIZE_3:
+        break;
+    case 3:
         frameSize = FRAME_SIZE_3;
         controlBlock[3] = pnControlCode;
         controlBlock[4] = pnControlCodeInv;
-        break;
-    case FRAME_SIZE_4:
+        break;
+    case 4:
         frameSize = FRAME_SIZE_4;
         controlBlock[3] = pnControlCode;
         controlBlock[4] = pnControlCode;
-        break;
+        break;
     default:
         // unsupported frame size
@@ -142 +147 @@
                   << "unsupported frame size (" << _fs << ")" << std::endl;
         std::cout << "  => using " << FRAME_SIZE_1 << " instead" << std::endl;
-        ConfigureFrameSize(FRAME_SIZE_1);
-    }
+        ConfigureFrameSize(1);
+    }
+    
+     //std::cout << "FrameAssemblerDSP::ConfigureFrameSize(): "<<frameSize<<std::endl;
 }
 
@@ -212 +219 @@
 }
 
-
+void FrameAssemblerDSP::SetFrameSize(unsigned int inframesize, unsigned int inframesizeno)
+{
+ switch ( inframesizeno ) {
+    case 0:
+       std::cerr << "ERROR: FrameSynchronizerDSP::SetFrameSize:0 frame size option not allowed to be set"<<std::endl;
+      throw 0;
+      break;
+   case 1:
+      FRAME_SIZE_1=inframesize;
+      break;
+   case 2:
+      FRAME_SIZE_2=inframesize;
+      break;
+   case 3:
+      FRAME_SIZE_3=inframesize;
+      break;
+   case 4:
+      FRAME_SIZE_4=inframesize;
+      break;
+   default:
+      std::cerr << "ERROR: FrameSynchronizerDSP::SetFrameSize:Invalid frame size option"<<std::endl;
+      throw 0;
+   }
+
+}
+
+
+unsigned int FrameAssemblerDSP::GetFrameSize(unsigned int inframesizeno)
+{
+  switch ( inframesizeno ) {
+    case 0:
+      return frameSize;
+      break;
+   case 1:
+      return FRAME_SIZE_1;
+      break;
+   case 2:
+      return FRAME_SIZE_2;
+      break;
+   case 3:
+      return FRAME_SIZE_3;
+      break;
+   case 4:
+      return FRAME_SIZE_4;
+      break;
+   default:
+      std::cerr << "ERROR: FrameSynchronizerDSP::GetFrameSize:Invalid frame size option"<<std::endl;
+      throw 0;
+   }
+
+}
+

ossiedev/branches/hvolos/packetwfrm/components/FrameAssembler/src/FrameAssemblerDSP.h

@@ -29 +29 @@
 #include "PNCodes.h"
 
-#define FRAME_SIZE_1 2048   ///< Frame size option 1
-#define FRAME_SIZE_2 4096   ///< Frame size option 2
-#define FRAME_SIZE_3 8192   ///< Frame size option 3
-#define FRAME_SIZE_4 512    ///< Frame size option 4
+//#define FRAME_SIZE_1 2048   ///< Frame size option 1
+//#define FRAME_SIZE_2 4096   ///< Frame size option 2
+//#define FRAME_SIZE_3 8192   ///< Frame size option 3
+//#define FRAME_SIZE_4 512    ///< Frame size option 4
 
 
@@ -48 +48 @@
     /// Destructor
     ~FrameAssemblerDSP();
+    
+    void SetFrameSize(unsigned int inframesize, unsigned int inframesizeno);
+
+    unsigned int GetFrameSize(unsigned int inframesizeno);
 
   protected:
@@ -61 +65 @@
     ///
     unsigned int frameSize;
+    
+    unsigned int FRAME_SIZE_1,FRAME_SIZE_2,FRAME_SIZE_3,FRAME_SIZE_4;
 
     ///

ossiedev/branches/hvolos/packetwfrm/components/FrameAssembler/src/main.cpp

@@ -3 +3 @@
 Copyright 2006 Virginia Polytechnic Institute and State University
 
-This file is part of the OSSIE FrameAssembler_metadata.
+This file is part of the OSSIE FrameAssembler.
 
-OSSIE FrameAssembler_metadata is free software; you can redistribute it and/or modify
+OSSIE FrameAssembler is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
-OSSIE FrameAssembler_metadata is distributed in the hope that it will be useful,
+OSSIE FrameAssembler is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -16 +16 @@
 
 You should have received a copy of the GNU General Public License
-along with OSSIE FrameAssembler_metadata; if not, write to the Free Software
+along with OSSIE FrameAssembler; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
@@ -25 +25 @@
 #include "ossie/debug.h"
 
-#include "FrameAssembler_metadata.h"
+#include "FrameAssembler.h"
 
 using namespace std;
@@ -48 +48 @@
     cout << "Identifier - " << uuid << "  Label - " << label << endl;
 
-    FrameAssembler_metadata_i* frameassembler_servant;
+    FrameAssembler_i* frameassembler_servant;
     CF::Resource_var frameassembler_var;
 
     // Create the frameassembler component servant and object reference
 
-    frameassembler_servant = new FrameAssembler_metadata_i(uuid, component_running);
+    frameassembler_servant = new FrameAssembler_i(uuid, component_running);
     frameassembler_var = frameassembler_servant->_this();
 

ossiedev/branches/hvolos/packetwfrm/components/FrameAssembler/xml/FrameAssembler.prf.xml

@@ -4 +4 @@
 <!--Powered by Python-->
 <properties>
-    <simple type="string" id="DCE:c15e70e4-96e4-4cc8-b1f0-06cb301f6c2e" name="mod_type" mode="readwrite">
+    <simple type="string" id="DCE:a15e70e4-96e4-4cc8-b1f0-06cb301f6c2e" name="mod_type" mode="readwrite">
         <description>Modulation type: BPSK, QPSK, 8PSK, 16QAM</description>
         <value>BPSK</value>
         <kind kindtype="configure"/>
     </simple>
-    <simple type="ushort" id="DCE:06b798ba-5412-4bbe-bf0b-8ca665d25b83" name="frame_size" mode="readwrite">
-        <description>Frame size (number of modulated symbols): 2048, 4096, 8192, 16384</description>
+    <simple type="ushort" id="DCE:96b798ba-5412-4bbe-bf0b-8ca665d25b83" name="FrameSizeOptionNumber" mode="readwrite">
+        <description>Frame Size Option Number</description>
+        <value>1</value>
+        <kind kindtype="configure"/>
+    </simple>
+    <simple type="ushort" id="DCE:cdac2d50-214c-4c47-8a6d-d9ec453b3b3c" name="FrameSizeOption1" mode="readwrite">
+        <description>Frame Size for Option 1</description> 
+        <value>512</value>
+        <kind kindtype="configure"/>
+    </simple>
+    <simple type="ushort" id="DCE:a6caa288-08d2-4f0e-b0f0-f34fa513ce3d" name="FrameSizeOption2" mode="readwrite">
+        <description>Frame Size for Option 2</description> 
         <value>2048</value>
         <kind kindtype="configure"/>
     </simple>
+    <simple type="ushort" id="DCE:bcf3ff9b-9f9d-4498-b29a-78f813678271" name="FrameSizeOption3" mode="readwrite">
+        <description>Frame Size for Option 3</description> 
+        <value>4096</value>
+        <kind kindtype="configure"/>
+    </simple>
+    <simple type="ushort" id="DCE:34311a06-2055-4490-a949-478786cad4d4" name="FrameSizeOption4" mode="readwrite">
+        <description>Frame Size for Option 4</description> 
+        <value>8192</value>
+        <kind kindtype="configure"/>
+    </simple>
 </properties>

ossiedev/branches/hvolos/packetwfrm/components/FrameAssembler/xml/FrameAssembler.spd.xml

@@ -3 +3 @@
 <!--Created with OSSIE WaveDev Beta Version 0.6.0b-->
 <!--Powered by Python-->
-<softpkg name="FrameAssembler_metadata" id="DCE:fd67fe3a-ec3b-45f6-8c2b-b4cdab07ad56">
+<softpkg name="FrameAssembler" id="DCE:ad67fe3a-ec3b-45f6-8c2b-b4cdab07ad56">
     <title>Frame assembler component</title>
     <description>Adds BPSK preamble header information for assembling frames</description>
@@ -12 +12 @@
     </author>
     <propertyfile type="PRF">
-        <localfile name="xml/FrameAssembler_metadata/FrameAssembler_metadata.prf.xml"/>
+        <localfile name="xml/FrameAssembler/FrameAssembler.prf.xml"/>
     </propertyfile>
     <descriptor>
-        <localfile name="xml/FrameAssembler_metadata/FrameAssembler_metadata.scd.xml"/>
+        <localfile name="xml/FrameAssembler/FrameAssembler.scd.xml"/>
     </descriptor>
-    <implementation id="DCE:a2a578b9-6ca0-4e20-9375-196a5f2a8121">
+    <implementation id="DCE:d2a578b9-6ca0-4e20-9375-196a5f2a8121">
         <description>Default implementation description</description> 
         <code type="Executable">
-            <localfile name="bin/FrameAssembler_metadata"/>
+            <localfile name="bin/FrameAssembler"/>
         </code>
         <processor name="x86"/>