Changeset 6796

Show
Ignore:
Timestamp:
03/25/08 12:50:01 (5 years ago)
Author:
hvolos
Message:

commit latest changes

Location:
ossiedev/branches/hvolos/ossie-sdrf2007
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • ossiedev/branches/hvolos/ossie-sdrf2007/components/AGCwSWDIV/src/AGCwSWDIV.cpp

    r6733 r6796  
    179179            std::cout << std::endl; 
    180180            std::cout << std::endl; 
     181        } else if (strcmp(props[i].id, "DCE:26cf7600-5d91-42d9-bb17-d0dc45ebfeec") == 0) { 
     182            // g_max 
     183            props[i].value >>= simple_temp; 
     184            omni_mutex_lock oml(accessPrivateData); 
     185            rx_ant_0_cal = simple_temp; 
     186 
     187            DEBUG(3, AGCwSWDIV, "prop (rx_ant0_cal): " << simple_temp) 
     188        } else if (strcmp(props[i].id, "DCE:e27c1e47-fbba-462e-a73f-acfbebe578e5") == 0) { 
     189            // g_max 
     190            props[i].value >>= simple_temp; 
     191            omni_mutex_lock oml(accessPrivateData); 
     192            rx_ant_1_cal = simple_temp; 
     193 
     194            DEBUG(3, AGCwSWDIV, "prop (rx_ant1_cal): " << simple_temp) 
    181195        } else { 
    182196            // unknown property 

  • ossiedev/branches/hvolos/ossie-sdrf2007/components/AGCwSWDIV/src/AGCwSWDIV.h

    r6733 r6796  
    133133        short rssi_pass_packet_counter; 
    134134         
     135        /// Calibration value for rx ant port 0 
     136        float rx_ant_0_cal 
     137         
     138        /// Calibration value for rx ant port 1 
     139        float rx_ant_1_cal 
    135140}; 
    136141#endif 

  • ossiedev/branches/hvolos/ossie-sdrf2007/components/AGCwSWDIV/src/main.cpp

    r6733 r6796  
    3333int main(int argc, char* argv[]) 
    3434{ 
    35     ossieDebugLevel = 1; 
     35    ossieDebugLevel = 10; 
    3636    ossieSupport::ORB *orb = new ossieSupport::ORB; 
    3737    omni_mutex component_running_mutex; 

  • ossiedev/branches/hvolos/ossie-sdrf2007/waveforms/CIRENwSWDIV/CIRENwSWDIV.sad.xml

    r6788 r6796  
    33<!--Created with OSSIE WaveDev Beta Version 0.6.0b--> 
    44<!--Powered by Python--> 
    5 <softwareassembly id="DCE:3641915e-a8f7-409d-930e-13b4eb28e70c" name="OSSIE::CIREN"> 
     5<softwareassembly id="DCE:3641915e-a8f7-409d-930e-13b4eb28e70c" name="OSSIE::CIRENwSWDIV"> 
    66    <componentfiles> 
    77        <componentfile id="rc2007_gui_5f3cc15a-86f2-11dc-bf0d-00123f63025f" type="SPD">