Changeset 9429

Show
Ignore:
Timestamp:
08/26/08 21:37:08
Author:
jcorgan
Message:

wip

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • usrp2/branches/developers/jcorgan/wip/host-ng/gr-usrp2/test.sh

    r9428 r9429  
    11#!/bin/sh 
    22 
    3 sudo ./test_gr_usrp2 -v 
     3sudo ./test_gr_usrp2 -d 4 -v 

  • usrp2/branches/developers/jcorgan/wip/host-ng/gr-usrp2/test_gr_usrp2.cc

    r9427 r9429  
    2121#endif 
    2222 
     23#include <usrp2/strtod_si.h> 
    2324#include <gruel/realtime.h> 
    2425#include <usrp2_source_c.h> 
    …… 
    4142  fprintf(stderr, "  -e ETH_INTERFACE     specify ethernet interface [default=eth0]\n"); 
    4243  fprintf(stderr, "  -m MAC_ADDR          mac address of USRP2 HH:HH [default=first one found]\n"); 
    43 #if 0 
     44  fprintf(stderr, "  -g GAIN              specify receive daughterboard gain [default=0]\n"); 
    4445  fprintf(stderr, "  -f FREQUENCY         specify receive center frequency in Hz [default=0.0]\n"); 
    4546  fprintf(stderr, "  -d DECIM             specify receive decimation rate [default=5]\n"); 
    46   fprintf(stderr, "  -g GAIN              specify receive daughterboard gain [default=0]\n"); 
     47#if 0 
    4748  fprintf(stderr, "  -N NSAMPLES          specify number of samples to receive [default=infinite]\n"); 
    4849  fprintf(stderr, "  -o OUTPUT_FILENAME   specify file to receive samples [default=none]\n"); 
    …… 
    5859  const char *interface = "eth0"; 
    5960  const char *mac_addr_str = ""; 
    60 #if 0 
     61  double rx_gain = 0.0; 
    6162  double rx_freq = 0.0; 
    6263  int rx_decim = 5; 
    63   double rx_gain = 0.0; 
     64#if 0 
    6465  uint64_t nsamples = 0; 
    6566  bool output_shorts = false; 
    …… 
    7172 
    7273  //while ((ch = getopt(argc, argv, "he:m:f:d:g:N:o:sv")) != EOF){ 
    73   while ((ch = getopt(argc, argv, "he:m:v")) != EOF){ 
     74  while ((ch = getopt(argc, argv, "he:m:g:f:d:v")) != EOF){ 
    7475    //double tmp; 
    7576    switch (ch){ 
    …… 
    8283      mac_addr_str = optarg; 
    8384      break; 
    84 #if 0 
    85     case 'f': 
    86       if (!strtod_si(optarg, &rx_freq)) { 
     85 
     86    case 'g': 
     87      if (!strtod_si(optarg, &rx_gain)) { 
    8788        std::cerr << "invalid number: " << optarg << std::endl; 
    8889        usage(argv[0]); 
    …… 
    9192      break; 
    9293 
    93     case 'g': 
    94       if (!strtod_si(optarg, &rx_gain)) { 
     94    case 'f': 
     95      if (!strtod_si(optarg, &rx_freq)) { 
    9596        std::cerr << "invalid number: " << optarg << std::endl; 
    9697        usage(argv[0]); 
    …… 
    108109      break; 
    109110 
     111#if 0 
    110112    case 'N': 
    111113      if (!strtod_si(optarg, &tmp)) { 
    …… 
    142144  usrp2_source_c_sptr u2 = usrp2_make_source_c(interface, mac_addr_str); 
    143145 
    144 #if 0 
    145   if (!u2->set_rx_gain(rx_gain)){ 
    146     fprintf(stderr, "set_rx_gain(%f) failed\n", rx_gain); 
     146  if (!u2->set_gain(rx_gain)){ 
     147    fprintf(stderr, "set_gain(%f) failed\n", rx_gain); 
    147148    exit(1); 
    148149  } 
    149150 
    150151  usrp2::tune_result tr; 
    151   if (!u2->set_rx_center_freq(rx_freq, &tr)){ 
    152     fprintf(stderr, "set_rx_center_freq(%g) failed\n", rx_freq); 
     152  if (!u2->set_center_freq(rx_freq, &tr)){ 
     153    fprintf(stderr, "set_center_freq(%g) failed\n", rx_freq); 
    153154    exit(1); 
    154155  } 
    155 #endif 
    156156 
    157157  if (verbose){ 
    158158    printf("USRP2 MAC address: %s\n\n", u2->mac_addr().c_str()); 
    159 #if 0 
    160159    printf("Daughterboard configuration:\n"); 
    161160    printf("  baseband_freq=%f\n", tr.baseband_freq); 
    …… 
    163162    printf("  residual_freq=%f\n", tr.residual_freq); 
    164163    printf("       inverted=%s\n\n", tr.spectrum_inverted ? "yes" : "no"); 
    165 #endif 
    166164  } 
    167 #if 0 
    168   if (!u2->set_rx_decim(rx_decim)) { 
    169     fprintf(stderr, "set_rx_decim(%d) failed\n", rx_decim); 
     165 
     166  if (!u2->set_decim(rx_decim)) { 
     167    fprintf(stderr, "set_decim(%d) failed\n", rx_decim); 
    170168    exit(1); 
    171169  } 
    …… 
    173171  if (verbose) 
    174172    printf("USRP2 using decimation rate of %d\n", rx_decim); 
    175      
     173 
     174#if 0     
    176175  if (verbose) { 
    177176    if (nsamples > 0) 

  • usrp2/branches/developers/jcorgan/wip/host-ng/gr-usrp2/usrp2_source_base.cc

    r9422 r9429  
    5050} 
    5151 
     52bool 
     53usrp2_source_base::set_gain(double gain) 
     54{ 
     55  return d_u2->set_rx_gain(gain); 
     56} 
     57 
     58bool 
     59usrp2_source_base::set_center_freq(double frequency, usrp2::tune_result *tr) 
     60{ 
     61  return d_u2->set_rx_center_freq(frequency, tr); 
     62} 
     63 
     64bool 
     65usrp2_source_base::set_decim(int decimation_factor) 
     66{ 
     67  return d_u2->set_rx_decim(decimation_factor); 
     68} 
     69 
    5270int 
    5371usrp2_source_base::work(int noutput_items, 

  • usrp2/branches/developers/jcorgan/wip/host-ng/gr-usrp2/usrp2_source_base.h

    r9422 r9429  
    4242  ~usrp2_source_base(); 
    4343 
     44  /*! 
     45   * \brief Return USRP2 MAC address 
     46   */ 
    4447  const std::string &mac_addr() const { return d_u2->mac_addr(); } 
    45    
     48 
     49  /*! 
     50   * \brief Set receiver gain 
     51   */ 
     52  bool set_gain(double gain); 
     53 
     54  /*! 
     55   * \brief Set receiver center frequency 
     56   */ 
     57  bool set_center_freq(double frequency, usrp2::tune_result *tr); 
     58    
     59  /*! 
     60   * \brief Set receive decimation rate 
     61   */ 
     62  bool set_decim(int decimation_factor); 
     63 
    4664  int work(int noutput_items, 
    4765           gr_vector_const_void_star &input_items,