Changeset 3809

Show
Ignore:
Timestamp:
05/17/07 13:32:03 (6 years ago)
Author:
jgaeddert
Message:

changing component name, file names, etc.

Location:
components/USRP_TX_Control/branches/USRP_Commander
Files:
4 modified
5 moved

Legend:

Unmodified
Added
Removed

  • components/USRP_TX_Control/branches/USRP_Commander/.ignore

    r3441 r3809  
    1 USRP_TX_Control 
     1USRP_Commander 
    22aclocal.m4 
    33install-sh 

  • components/USRP_TX_Control/branches/USRP_Commander/Makefile.am

    r3441 r3809  
    11AM_CXXFLAGS = -Wall  
    22 
    3 bin_PROGRAMS = USRP_TX_Control 
     3bin_PROGRAMS = USRP_Commander 
    44 
    5 USRP_TX_Control_SOURCES = USRP_TX_Control.cpp USRP_TX_Control.h main.cpp 
     5USRP_Commander_SOURCES = USRP_Commander.cpp USRP_Commander.h main.cpp 
    66 
    7 ossieName = USRP_TX_Control 
     7ossieName = USRP_Commander 
    88xmldir = $(prefix)/xml/$(ossieName) 
    9 dist_xml_DATA = USRP_TX_Control.prf.xml USRP_TX_Control.scd.xml \ 
    10 USRP_TX_Control.spd.xml  
     9dist_xml_DATA = USRP_Commander.prf.xml USRP_Commander.scd.xml \ 
     10USRP_Commander.spd.xml  
    1111 

  • components/USRP_TX_Control/branches/USRP_Commander/USRP_Commander.cpp

    r3441 r3809  
    11/**************************************************************************** 
    22 
    3 Copyright 2006 Virginia Polytechnic Institute and State University 
     3Copyright 2007 Virginia Polytechnic Institute and State University 
    44 
    5 This file is part of the OSSIE USRP_TX_Control. 
     5This file is part of the OSSIE USRP_Commander. 
    66 
    7 OSSIE USRP_TX_Control is free software; you can redistribute it and/or modify 
     7OSSIE USRP_Commander is free software; you can redistribute it and/or modify 
    88it under the terms of the GNU General Public License as published by 
    99the Free Software Foundation; either version 2 of the License, or 
    1010(at your option) any later version. 
    1111 
    12 OSSIE USRP_TX_Control is distributed in the hope that it will be useful, 
     12OSSIE USRP_Commander is distributed in the hope that it will be useful, 
    1313but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1414MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    … …  
    1616 
    1717You should have received a copy of the GNU General Public License 
    18 along with OSSIE USRP_TX_Control; if not, write to the Free Software 
     18along with OSSIE USRP_Commander; if not, write to the Free Software 
    1919Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    2020 
    … …  
    2929#include "ossie/debug.h" 
    3030 
    31 #include "USRP_TX_Control.h" 
     31#include "USRP_Commander.h" 
    3232 
    3333#include "ossie/Resource_impl.h" 
    3434 
    35 USRP_TX_Control_i::USRP_TX_Control_i(const char *uuid, omni_condition *condition) : Resource_impl(uuid), component_running(condition)  
     35USRP_Commander_i::USRP_Commander_i(const char *uuid, omni_condition *condition) : Resource_impl(uuid), component_running(condition)  
    3636{ 
    3737    TXControl = new standardInterfaces_i::TX_Control_u("TX_Control"); 
    … …  
    3939} 
    4040 
    41 CORBA::Object_ptr USRP_TX_Control_i::getPort( const char* portName ) throw (CORBA::SystemException, CF::PortSupplier::UnknownPort) 
     41CORBA::Object_ptr USRP_Commander_i::getPort( const char* portName ) throw (CORBA::SystemException, CF::PortSupplier::UnknownPort) 
    4242{ 
    43     DEBUG(3, USRP_TX_Control, "getPort called with : " << portName) 
     43    DEBUG(3, USRP_Commander, "getPort called with : " << portName) 
    4444     
    4545    CORBA::Object_var p; 
    … …  
    5959} 
    6060 
    61 void USRP_TX_Control_i::start() throw (CORBA::SystemException, CF::Resource::StartError) 
     61void USRP_Commander_i::start() throw (CORBA::SystemException, CF::Resource::StartError) 
    6262{ 
    63     DEBUG(3, USRP_TX_Control, "start called on USRP_TX_Control") 
     63    DEBUG(3, USRP_Commander, "start called on USRP_Commander") 
    6464 
    6565    CF::Resource_var r = data_control->getRef(); 
    … …  
    8181} 
    8282 
    83 void USRP_TX_Control_i::stop() throw (CORBA::SystemException, CF::Resource::StopError)  
     83void USRP_Commander_i::stop() throw (CORBA::SystemException, CF::Resource::StopError)  
    8484{   
    85     DEBUG(3, USRP_TX_Control, "stop called on USRP_TX_Control") 
     85    DEBUG(3, USRP_Commander, "stop called on USRP_Commander") 
    8686 
    8787    CF::Resource_var r = data_control->getRef(); 
    … …  
    9292} 
    9393 
    94 void USRP_TX_Control_i::releaseObject() throw (CORBA::SystemException, CF::LifeCycle::ReleaseError) 
     94void USRP_Commander_i::releaseObject() throw (CORBA::SystemException, CF::LifeCycle::ReleaseError) 
    9595{ 
    96     DEBUG(3, USRP_TX_Control, "releaseObject called on USRP_TX_Control") 
     96    DEBUG(3, USRP_Commander, "releaseObject called on USRP_Commander") 
    9797     
    9898    component_running->signal(); 
    9999} 
    100100 
    101 void USRP_TX_Control_i::initialize() throw (CF::LifeCycle::InitializeError, CORBA::SystemException) 
     101void USRP_Commander_i::initialize() throw (CF::LifeCycle::InitializeError, CORBA::SystemException) 
    102102{ 
    103     DEBUG(3, USRP_TX_Control, "initialize called on USRP_TX_Control") 
     103    DEBUG(3, USRP_Commander, "initialize called on USRP_Commander") 
    104104} 
    105105 
    106 void USRP_TX_Control_i::configure(const CF::Properties& props) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration) 
     106void USRP_Commander_i::configure(const CF::Properties& props) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration) 
    107107{ 
    108     DEBUG(3, USRP_TX_Control, "configure called on USRP_TX_Control") 
     108    DEBUG(3, USRP_Commander, "configure called on USRP_Commander") 
    109109     
    110     DEBUG(3, USRP_TX_Control, "props length : " << props.length()) 
     110    DEBUG(3, USRP_Commander, "props length : " << props.length()) 
    111111 
    112112    for (unsigned int i = 0; i <props.length(); i++) { 

  • components/USRP_TX_Control/branches/USRP_Commander/USRP_Commander.h

    r3441 r3809  
    11/**************************************************************************** 
    22 
    3 Copyright 2006 Virginia Polytechnic Institute and State University 
     3Copyright 2007 Virginia Polytechnic Institute and State University 
    44 
    5 This file is part of the OSSIE USRP_TX_Control. 
     5This file is part of the OSSIE USRP_Commander. 
    66 
    7 OSSIE USRP_TX_Control is free software; you can redistribute it and/or modify 
     7OSSIE USRP_Commander is free software; you can redistribute it and/or modify 
    88it under the terms of the GNU General Public License as published by 
    99the Free Software Foundation; either version 2 of the License, or 
    1010(at your option) any later version. 
    1111 
    12 OSSIE USRP_TX_Control is distributed in the hope that it will be useful, 
     12OSSIE USRP_Commander is distributed in the hope that it will be useful, 
    1313but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1414MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    … …  
    1616 
    1717You should have received a copy of the GNU General Public License 
    18 along with OSSIE USRP_TX_Control; if not, write to the Free Software 
     18along with OSSIE USRP_Commander; if not, write to the Free Software 
    1919Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    2020 
    … …  
    2222 
    2323 
    24 #ifndef USRP_TX_CONTROL_IMPL_H 
    25 #define USRP_TX_CONTROL_IMPL_H 
     24#ifndef USRP_COMMANDER_IMPL_H 
     25#define USRP_COMMANDER_IMPL_H 
    2626 
    2727#include <stdlib.h> 
    … …  
    3636#include "ossie/Resource_impl.h" 
    3737 
    38 class USRP_TX_Control_i : public virtual Resource_impl 
     38class USRP_Commander_i : public virtual Resource_impl 
    3939{ 
    4040    public: 
    41         USRP_TX_Control_i(const char *uuid, omni_condition *sem); 
     41        USRP_Commander_i(const char *uuid, omni_condition *sem); 
    4242 
    4343        void start() throw (CF::Resource::StartError, CORBA::SystemException); 
    … …  
    5353 
    5454    private: 
    55         USRP_TX_Control_i(); 
    56         USRP_TX_Control_i(USRP_TX_Control_i&); 
     55        USRP_Commander_i(); 
     56        USRP_Commander_i(USRP_Commander_i&); 
    5757 
    5858        omni_condition *component_running;  //for component shutdown 

  • components/USRP_TX_Control/branches/USRP_Commander/USRP_Commander.spd.xml

    r3441 r3809  
    33<!--Created with OSSIE WaveDev Beta Version 0.6.0b--> 
    44<!--Powered by Python--> 
    5 <softpkg type="sca_compliant" name="USRP_TX_Control" id="DCE:aff94530-6ab7-11db-bd91-0004236abd3a"> 
     5<softpkg type="sca_compliant" name="USRP_Commander" id="DCE:aff94530-6ab7-11db-bd91-0004236abd3a"> 
    66    <title/> 
    77    <author> 
    … …  
    1111    </author> 
    1212    <propertyfile type="PRF"> 
    13         <localfile name="xml/USRP_TX_Control/USRP_TX_Control.prf.xml"/> 
     13        <localfile name="xml/USRP_Commander/USRP_Commander.prf.xml"/> 
    1414    </propertyfile> 
    1515    <descriptor> 
    16         <localfile name="xml/USRP_TX_Control/USRP_TX_Control.scd.xml"/> 
     16        <localfile name="xml/USRP_Commander/USRP_Commander.scd.xml"/> 
    1717    </descriptor> 
    1818    <implementation id="DCE:affa18de-6ab7-11db-91a5-0004236abd3a" aepcompliance="aep_compliant"> 
    1919        <description>Default Description</description>  
    2020        <code type="Executable"> 
    21             <localfile name="bin/USRP_TX_Control"/> 
     21            <localfile name="bin/USRP_Commander"/> 
    2222        </code> 
    2323        <processor name="x86"/> 

  • components/USRP_TX_Control/branches/USRP_Commander/configure.ac

    r3441 r3809  
    1 AC_INIT(TX_RandomBits, 0.6.0) 
     1AC_INIT(USRP_Commander, 0.6.0) 
    22AM_INIT_AUTOMAKE 
    33 

  • components/USRP_TX_Control/branches/USRP_Commander/main.cpp

    r3441 r3809  
    11/**************************************************************************** 
    22 
    3 Copyright 2006 Virginia Polytechnic Institute and State University 
     3Copyright 2007 Virginia Polytechnic Institute and State University 
    44 
    5 This file is part of the OSSIE USRP_TX_Control. 
     5This file is part of the OSSIE USRP_Commander. 
    66 
    7 OSSIE USRP_TX_Control is free software; you can redistribute it and/or modify 
     7OSSIE USRP_Commander is free software; you can redistribute it and/or modify 
    88it under the terms of the GNU General Public License as published by 
    99the Free Software Foundation; either version 2 of the License, or 
    1010(at your option) any later version. 
    1111 
    12 OSSIE USRP_TX_Control is distributed in the hope that it will be useful, 
     12OSSIE USRP_Commander is distributed in the hope that it will be useful, 
    1313but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1414MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    … …  
    1616 
    1717You should have received a copy of the GNU General Public License 
    18 along with OSSIE USRP_TX_Control; if not, write to the Free Software 
     18along with OSSIE USRP_Commander; if not, write to the Free Software 
    1919Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    2020 
    … …  
    2626#include "ossie/debug.h" 
    2727 
    28 #include "USRP_TX_Control.h" 
     28#include "USRP_Commander.h" 
    2929 
    3030int main(int argc, char* argv[]) 
    … …  
    4545    char *label = argv[2]; 
    4646 
    47     DEBUG(3, USRP_TX_Control, "Identifier - " << uuid << "  Label - " << label) 
     47    DEBUG(3, USRP_Commander, "Identifier - " << uuid << "  Label - " << label) 
    4848 
    49     USRP_TX_Control_i* usrp_tx_control_servant; 
    50     CF::Resource_var usrp_tx_control_var; 
     49    USRP_Commander_i* usrp_commander_servant; 
     50    CF::Resource_var usrp_commander_var; 
    5151 
    52     // Create the usrp_tx_control component servant and object reference 
     52    // Create the usrp_commander component servant and object reference 
    5353 
    54     usrp_tx_control_servant = new USRP_TX_Control_i(uuid, component_running); 
    55     usrp_tx_control_var = usrp_tx_control_servant->_this(); 
     54    usrp_commander_servant = new USRP_Commander_i(uuid, component_running); 
     55    usrp_commander_var = usrp_commander_servant->_this(); 
    5656 
    57     orb->bind_object_to_name((CORBA::Object_ptr) usrp_tx_control_var, label); 
     57    orb->bind_object_to_name((CORBA::Object_ptr) usrp_commander_var, label); 
    5858 
    5959    // This bit is ORB specific