@@ -45,9 +45,9 @@ int main(int32 argc, char** argv) repeats = atoi(argv[2]); } - printf("%d\n",argc); + fprintf(stdout,"%d\n",argc); for(lcv = 0; lcv < argc; lcv++) - printf("%s\n",argv[lcv]); + fprintf(stdout,"%s\n",argv[lcv]); /* Read in the data */ fp = fopen("input.dat","rb"); @@ -66,7 +66,7 @@ int main(int32 argc, char** argv) /* FFT */ /*-------------------------------------------*/ FFT aFFT(N); - printf("FFT Created\n"); + fprintf(stdout,"FFT Created\n"); time_0 = clock(); @@ -78,7 +78,7 @@ int main(int32 argc, char** argv) t1 = (double)(time_1 - time_0) /CLOCKS_PER_SEC; - printf("Time: %f\n",t1); + fprintf(stdout,"Time: %f\n",t1); fpo = fopen("output.dat","wb"); if(fpo != NULL) accessories/fft-test.cpp gps-gse gps-sdr @@ -136,8 +136,8 @@ GUI_Serial::GUI_Serial() byte_count = 0; serial = 0; npipe_open = false; - npipe[READ] = NULL; - npipe[WRITE] = NULL; + npipe[READ] = -1; + npipe[WRITE] = -1; lfile = NULL; packet_count[LAST_M_ID] = 0; decoded_packet.tic = decoded_packet.id = decoded_packet.length = 0; @@ -179,8 +179,8 @@ void GUI_Serial::openSerial() spipe = open("/dev/ttyS0", O_RDWR | O_NOCTTY | O_NONBLOCK); if(spipe < 0) { - npipe[READ] = NULL; - npipe[WRITE] = NULL; + npipe[READ] = -1; + npipe[WRITE] = -1; npipe_open = false; return; } @@ -246,8 +246,8 @@ void GUI_Serial::setPipe(bool _status) { close(npipe[READ]); close(npipe[WRITE]); - npipe[READ] = NULL; - npipe[WRITE] = NULL; + npipe[READ] = -1; + npipe[WRITE] = -1; } } /*----------------------------------------------------------------------------------------------*/ @@ -262,8 +262,8 @@ void GUI_Serial::setIO(int32 _serial) npipe_open = false; close(npipe[READ]); close(npipe[WRITE]); - npipe[READ] = NULL; - npipe[WRITE] = NULL; + npipe[READ] = -1; + npipe[WRITE] = -1; } serial = _serial; gse/src/gui_serial.cpp @@ -72,6 +72,7 @@ typedef struct _Options_S int32 mode; //!< Run in a 2 antenna mode with 2 DBS-RXs, Run in a 2 antenna mode, board A L1, board B L2 int32 decimate; int32 realtime; + int32 tlm_type; //!< Telemetry type (named pipe/serial) double f_lo_a; //!< LO freq for board A double f_ddc_a; //!< DDC freq for board A double f_lo_b; //!< LO freq for board B includes/sdr_structs.h @@ -46,17 +46,18 @@ /*----------------------------------------------------------------------------------------------*/ void usage(char *_str) { - fprintf(stderr, "\n"); - fprintf(stderr, "usage: [-c] [-v] [-gr] [-gi] [-d] [-l] [-w] [-x]\n"); - fprintf(stderr, "[-c] log high rate channel data\n"); - fprintf(stderr, "[-v] be verbose \n"); - fprintf(stderr, "[-gr] <gain> set rf gain in dB (DBSRX only)\n"); - fprintf(stderr, "[-gi] <gain> set if gain in dB (DBSRX only)\n"); - fprintf(stderr, "[-d] operate in two antenna mode, A & B as L1\n"); - fprintf(stderr, "[-l] operate in L1-L2 mode, A as L1, B as L2\n"); - fprintf(stderr, "[-w] <bandwidth> bandwidth of lowpass filter\n"); - fprintf(stderr, "[-x] the USRP samples at a modified 65.536 MHz (default is 64 MHz)\n"); - fflush(stderr); + fprintf(stdout,"\n"); + fprintf(stdout,"usage: [-c] [-v] [-gr] [-gi] [-d] [-l] [-w] [-x] [-s]\n"); + fprintf(stdout,"[-c] log high rate channel data\n"); + fprintf(stdout,"[-v] be verbose \n"); + fprintf(stdout,"[-gr] <gain> set rf gain in dB (DBSRX only)\n"); + fprintf(stdout,"[-gi] <gain> set if gain in dB (DBSRX only)\n"); + fprintf(stdout,"[-d] operate in two antenna mode, A & B as L1\n"); + fprintf(stdout,"[-l] operate in L1-L2 mode, A as L1, B as L2\n"); + fprintf(stdout,"[-w] <bandwidth> bandwidth of lowpass filter\n"); + fprintf(stdout,"[-x] the USRP samples at a modified 65.536 MHz (default is 64 MHz)\n"); + fprintf(stdout,"[-s] output over /dev/ttyS0 instead of the named pipe\n"); + fflush(stdout); exit(1); } /*----------------------------------------------------------------------------------------------*/ @@ -70,18 +71,19 @@ void echo_options() if(gopt.verbose) { - fprintf(stderr, "\n"); - fprintf(stderr, "Verbose:\t\t\t %d\n",gopt.verbose); - fprintf(stderr, "Log channel:\t\t\t %d\n",gopt.log_channel); - fprintf(stderr, "USRP Sample Rate:\t% 15.2f\n",gopt.f_sample); - fprintf(stderr, "USRP Decimation:\t% 15d\n",gopt.decimate); - fprintf(stderr, "DBSRX LO A:\t\t% 15.2f\n",gopt.f_lo_a); - fprintf(stderr, "DBSRX LO B:\t\t% 15.2f\n",gopt.f_lo_b); - fprintf(stderr, "RF Gain:\t\t% 15.2f\n",gopt.gr); - fprintf(stderr, "IF Gain:\t\t% 15.2f\n",gopt.gi); - fprintf(stderr, "DBSRX Bandwidth:\t% 15.2f\n",gopt.bandwidth); - fprintf(stderr, "\n"); - fflush(stderr); + fprintf(stdout,"\n"); + fprintf(stdout,"Verbose: %13d\n",gopt.verbose); + fprintf(stdout,"Log channel: %13d\n",gopt.log_channel); + fprintf(stdout,"Telemetry: %13d\n",gopt.tlm_type); + fprintf(stdout,"USRP Decimation: %13d\n",gopt.decimate); + fprintf(stdout,"USRP Sample Rate: %13.2f\n",gopt.f_sample); + fprintf(stdout,"DBSRX LO A: %13.2f\n",gopt.f_lo_a); + fprintf(stdout,"DBSRX LO B: %13.2f\n",gopt.f_lo_b); + fprintf(stdout,"RF Gain: %13.2f\n",gopt.gr); + fprintf(stdout,"IF Gain: %13.2f\n",gopt.gi); + fprintf(stdout,"DBSRX Bandwidth: %13.2f\n",gopt.bandwidth); + fprintf(stdout,"\n"); + fflush(stdout); } } @@ -99,6 +101,7 @@ void Parse_Arguments(int32 argc, char* argv[]) /* Set default options */ gopt.verbose = 0; gopt.log_channel = 0; + gopt.tlm_type = TELEM_NAMED_PIPE; gopt.mode = 0; //!< Single board L1 mode by default gopt.decimate = 16; //!< Default to work with both 65.536 and 64 MHz clocks gopt.gr = 40; //!< 40 dB of RF gain @@ -167,6 +170,9 @@ void Parse_Arguments(int32 argc, char* argv[]) case 'x': gopt.f_sample = 65.536e6; break; + case 's': + gopt.tlm_type = TELEM_SERIAL; + break; default: usage(argv[0]); } @@ -186,7 +192,7 @@ int32 Hardware_Init(void) if(CPU_MMX()) { if(gopt.verbose) - printf("Detected MMX\n"); + fprintf(stdout,"Detected MMX\n"); } else return(false); @@ -194,7 +200,7 @@ int32 Hardware_Init(void) if(CPU_SSE()) { if(gopt.verbose) - printf("Detected SSE\n"); + fprintf(stdout,"Detected SSE\n"); } else return(false); @@ -202,7 +208,7 @@ int32 Hardware_Init(void) if(CPU_SSE2()) { if(gopt.verbose) - printf("Detected SSE2\n"); + fprintf(stdout,"Detected SSE2\n"); } else return(false); @@ -210,25 +216,25 @@ int32 Hardware_Init(void) if(CPU_SSE3()) { if(gopt.verbose) - printf("Detected SSE3\n"); + fprintf(stdout,"Detected SSE3\n"); } if(CPU_SSSE3()) { if(gopt.verbose) - printf("Detected SSSE3\n"); + fprintf(stdout,"Detected SSSE3\n"); } if(CPU_SSE41()) { if(gopt.verbose) - printf("Detected SSE4.1\n"); + fprintf(stdout,"Detected SSE4.1\n"); } if(CPU_SSE42()) { if(gopt.verbose) - printf("Detected SSE4.2\n"); + fprintf(stdout,"Detected SSE4.2\n"); } return(1); @@ -261,6 +267,9 @@ int32 Object_Init(void) /* Output info to the GUI */ pTelemetry = new Telemetry(); + /* Serial or named pipe */ + pTelemetry->SetType(gopt.tlm_type); + /* execute user commands */ pCommando = new Commando(); @@ -281,7 +290,7 @@ int32 Object_Init(void) if(gopt.verbose) { - printf("Cleared Object Init\n"); + fprintf(stdout,"Cleared Object Init\n"); fflush(stdout); } @@ -328,7 +337,7 @@ int32 Pipes_Init(void) if(gopt.verbose) { - printf("Cleared Pipes Init\n"); + fprintf(stdout,"Cleared Pipes Init\n"); fflush(stdout); } main/init.cpp @@ -44,7 +44,7 @@ int main(int argc, char* argv[]) if(success == false) { Hardware_Shutdown(); - printf("Hardware_Init() failed, aborting.\n"); + fprintf(stderr,"Hardware_Init() failed, aborting.\n"); return(-1); } @@ -56,7 +56,7 @@ int main(int argc, char* argv[]) { Pipes_Shutdown(); Hardware_Shutdown(); - printf("Pipes_Init() failed, aborting.\n"); + fprintf(stderr,"Pipes_Init() failed, aborting.\n"); return(-1); } @@ -69,7 +69,7 @@ int main(int argc, char* argv[]) Pipes_Shutdown(); Object_Shutdown(); Hardware_Shutdown(); - printf("Object_Init() failed, aborting.\n"); + fprintf(stderr,"Object_Init() failed, aborting.\n"); return(-1); } @@ -83,7 +83,7 @@ int main(int argc, char* argv[]) Pipes_Shutdown(); Object_Shutdown(); Hardware_Shutdown(); - printf("Thread_Init() failed, aborting.\n"); + fprintf(stderr,"Thread_Init() failed, aborting.\n"); return(-1); } main/main.cpp @@ -57,7 +57,7 @@ void Acquisition::Start() Start_Thread(Acquisition_Thread, NULL); if(gopt.verbose) - printf("Acquisition thread started\n"); + fprintf(stdout,"Acquisition thread started\n"); } /*----------------------------------------------------------------------------------------------*/ @@ -142,7 +142,7 @@ Acquisition::Acquisition(float _fsample, float _fif):Threaded_Object("ACQTASK") pcFFT = new FFT(32); if(gopt.verbose) - printf("Creating Acquisition\n"); + fprintf(stdout,"Creating Acquisition\n"); } /*----------------------------------------------------------------------------------------------*/ @@ -177,7 +177,7 @@ Acquisition::~Acquisition() delete [] _750Hzwipeoff; if(gopt.verbose) - printf("Destructing Acquisition\n"); + fprintf(stdout,"Destructing Acquisition\n"); } /*----------------------------------------------------------------------------------------------*/ @@ -661,7 +661,7 @@ void Acquisition::Import() { if((packet.count - lastcount) != 1) { - printf("Broken GPS stream %d,%d\n",packet.count,lastcount); + fprintf(stdout,"Broken GPS stream %d,%d\n",packet.count,lastcount); ms = 0; /* Recollect data */ } } @@ -688,27 +688,27 @@ void Acquisition::Export(char * _fname) FILE *fp; Acq_Command_S *p; - if(_fname == NULL) - { - fp = fopen("acq.txt","wa"); - if(fp == NULL) - return; - fseek(fp, 0x0, SEEK_SET); - - } - else - { - fp = fopen(_fname,"wt"); - if(fp == NULL) - return; - } - - for(lcv = 0; lcv < MAX_SV; lcv++) - { - p = &results[lcv]; - fprintf(fp, "%2d, %2d, %12d, %12d, %12d, %1d\n",p->type,lcv+1,p->code_phase,p->doppler,p->magnitude,p->success); - } - fclose(fp); +// if(_fname == NULL) +// { +// fp = fopen("acq.txt","wa"); +// if(fp == NULL) +// return; +// fseek(fp, 0x0, SEEK_SET); +// +// } +// else +// { +// fp = fopen(_fname,"wt"); +// if(fp == NULL) +// return; +// } +// +// for(lcv = 0; lcv < MAX_SV; lcv++) +// { +// p = &results[lcv]; +// ffprintf(stdout,fp, "%2d, %2d, %12d, %12d, %12d, %1d\n",p->type,lcv+1,p->code_phase,p->doppler,p->magnitude,p->success); +// } +// fclose(fp); /* Write result to the tracking task */ results[request.sv].count = request.count; objects/acquisition.cpp @@ -35,7 +35,7 @@ Channel::Channel(int32 _chan):Threaded_Object("CHNTASK") chan = _chan; if(gopt.verbose) - printf("Creating Channel %d\n",chan); + fprintf(stdout,"Creating Channel %d\n",chan); if(gopt.log_channel) { @@ -61,7 +61,7 @@ Channel::~Channel() fclose(fp); if(gopt.verbose) - printf("Destructing Channel %d\n",chan); + fprintf(stdout,"Destructing Channel %d\n",chan); } /*----------------------------------------------------------------------------------------------*/ objects/channel.cpp @@ -31,7 +31,7 @@ void *Commando_Thread(void *_arg) { - while(1) + while(grun) { pCommando->Import(); } @@ -47,7 +47,7 @@ void Commando::Start() Start_Thread(Commando_Thread, NULL); if(gopt.verbose) - printf("Commando thread started\n"); + fprintf(stdout,"Commando thread started\n"); } /*----------------------------------------------------------------------------------------------*/ @@ -86,7 +86,7 @@ Commando::Commando():Threaded_Object("CMDTASK") cmd_handlers[LAST_C_ID] = NULL; if(gopt.verbose) - printf("Creating Commando\n"); + fprintf(stdout,"Creating Commando\n"); } /*----------------------------------------------------------------------------------------------*/ @@ -95,7 +95,7 @@ Commando::Commando():Threaded_Object("CMDTASK") Commando::~Commando() { if(gopt.verbose) - printf("Destructing Commando\n"); + fprintf(stdout,"Destructing Commando\n"); } /*----------------------------------------------------------------------------------------------*/ objects/commando.cpp @@ -54,7 +54,7 @@ void Correlator::Start() Start_Thread(Correlator_Thread, NULL); if(gopt.verbose) - printf("Correlator thread started\n"); + fprintf(stdout,"Correlator thread started\n"); } /*----------------------------------------------------------------------------------------------*/ @@ -94,7 +94,7 @@ Correlator::Correlator():Threaded_Object("CORTASK") SamplePRN(); if(gopt.verbose) - printf("Creating Correlator\n"); + fprintf(stdout,"Creating Correlator\n"); } /*----------------------------------------------------------------------------------------------*/ @@ -110,7 +110,7 @@ Correlator::~Correlator() delete [] main_code_rows; if(gopt.verbose) - printf("Destructing Correlator\n"); + fprintf(stdout,"Destructing Correlator\n"); } /*----------------------------------------------------------------------------------------------*/ objects/correlator.cpp @@ -33,7 +33,7 @@ void *Ephemeris_Thread(void *_arg) Ephemeris *aEphemeris = pEphemeris; - while(1) + while(grun) { aEphemeris->Import(); } @@ -51,7 +51,7 @@ void Ephemeris::Start() Start_Thread(Ephemeris_Thread, NULL); if(gopt.verbose) - printf("Ephemeris thread started\n"); + fprintf(stdout,"Ephemeris thread started\n"); } /*----------------------------------------------------------------------------------------------*/ @@ -72,7 +72,7 @@ Ephemeris::Ephemeris():Threaded_Object("EPHTASK") ClearAlmanac(MAX_SV); if(gopt.verbose) - printf("Creating Ephemeris\n"); + fprintf(stdout,"Creating Ephemeris\n"); } /*----------------------------------------------------------------------------------------------*/ @@ -81,7 +81,7 @@ Ephemeris::Ephemeris():Threaded_Object("EPHTASK") Ephemeris::~Ephemeris() { if(gopt.verbose) - printf("Destructing Ephemeris\n"); + fprintf(stdout,"Destructing Ephemeris\n"); } /*----------------------------------------------------------------------------------------------*/ objects/ephemeris.cpp @@ -136,7 +136,7 @@ void FFT::initW() W[lcv].nq = (short)(-s); W[lcv].ni = (short)(c); -// printf("W:%d,%d\n",W[lcv].i,W[lcv].q); +// fprintf(stdout,"W:%d,%d\n",W[lcv].i,W[lcv].q); //Inverse twiddles iW[lcv].i = (short)(c); @@ -165,7 +165,7 @@ void FFT::initBR() BR[lcv] = index; -// printf("BR:%d\n",BR[lcv]); +// fprintf(stdout,"BR:%d\n",BR[lcv]); } } objects/fft.cpp @@ -52,7 +52,7 @@ void FIFO::Start() Start_Thread(FIFO_Thread, NULL); if(gopt.verbose) - printf("FIFO thread started\n"); + fprintf(stdout,"FIFO thread started\n"); } /*----------------------------------------------------------------------------------------------*/ @@ -90,7 +90,7 @@ FIFO::FIFO():Threaded_Object("FIFTASK") sem_init(&sem_empty, NULL, FIFO_DEPTH); if(gopt.verbose) - printf("Creating FIFO\n"); + fprintf(stdout,"Creating FIFO\n"); } /*----------------------------------------------------------------------------------------------*/ @@ -107,7 +107,7 @@ FIFO::~FIFO() delete [] buff; if(gopt.verbose) - printf("Destructing FIFO\n"); + fprintf(stdout,"Destructing FIFO\n"); } /*----------------------------------------------------------------------------------------------*/ objects/fifo.cpp @@ -32,7 +32,7 @@ #include "telemetry.h" #include "gps_source.h" -#define FIFO_DEPTH (5000) //!< In ms +#define FIFO_DEPTH (2500) //!< In ms /*! \ingroup CLASSES * objects/fifo.h @@ -34,7 +34,7 @@ GPS_Source::GPS_Source(Options_S *_opt) Open_USRP_V1(); if(gopt.verbose) - printf("Creating GPS Source\n"); + fprintf(stdout,"Creating GPS Source\n"); } GPS_Source::~GPS_Source() @@ -42,7 +42,7 @@ GPS_Source::~GPS_Source() Close_USRP_V1(); if(gopt.verbose) - printf("Destructing GPS Source\n"); + fprintf(stdout,"Destructing GPS Source\n"); } void GPS_Source::Open_USRP_V1() @@ -85,7 +85,7 @@ void GPS_Source::Open_USRP_V1() if(urx == NULL) { if(opt.verbose) - printf("usrp_standard_rx::make FAILED\n"); + fprintf(stdout,"usrp_standard_rx::make FAILED\n"); } /* Set mux */ @@ -133,12 +133,12 @@ void GPS_Source::Open_USRP_V1() if(opt.verbose) { - printf("DBS-RX A Configuration\n"); - printf("DBS-RX A BW: \t\t% 15.2f\n",dbs_rx_a->bw()); - printf("DBS-RX A LO: \t\t% 15.2f\n",dbs_rx_a->freq()); - printf("DBS-RX A IF Gain: \t% 15.2f\n",dbs_rx_a->if_gain()); - printf("DBS-RX A RF Gain: \t% 15.2f\n",dbs_rx_a->rf_gain()); - printf("DDC 0: \t\t\t% 15.2f\n",urx->rx_freq(0)); + fprintf(stdout,"DBS-RX A Configuration\n"); + fprintf(stdout,"BW: %15.2f\n",dbs_rx_a->bw()); + fprintf(stdout,"LO: %15.2f\n",dbs_rx_a->freq()); + fprintf(stdout,"IF Gain: %15.2f\n",dbs_rx_a->if_gain()); + fprintf(stdout,"RF Gain: %15.2f\n",dbs_rx_a->rf_gain()); + fprintf(stdout,"DDC 0: %15.2f\n",urx->rx_freq(0)); } } @@ -184,19 +184,20 @@ void GPS_Source::Open_USRP_V1() if(opt.verbose) { - printf("DBS-RX B Actual Configuration\n"); - printf("DBS-RX B BW: \t\t% 15.2f\n",dbs_rx_b->bw()); - printf("DBS-RX B LO: \t\t% 15.2f\n",dbs_rx_b->freq()); - printf("DBS-RX B IF Gain: \t% 15.2f\n",dbs_rx_b->if_gain()); - printf("DBS-RX B RF Gain: \t% 15.2f\n",dbs_rx_b->rf_gain()); - printf("DDC 1: \t\t\t% 15.2f\n",urx->rx_freq(1)); + fprintf(stdout,"DBS-RX B Configuration\n"); + fprintf(stdout,"BW: %15.2f\n",dbs_rx_b->bw()); + fprintf(stdout,"LO: %15.2f\n",dbs_rx_b->freq()); + fprintf(stdout,"IF Gain: %15.2f\n",dbs_rx_b->if_gain()); + fprintf(stdout,"RF Gain: %15.2f\n",dbs_rx_b->rf_gain()); + fprintf(stdout,"DDC 0: %15.2f\n",urx->rx_freq(0)); + } } } /* Start collecting data */ - printf("USRP Start\n"); + fprintf(stdout,"USRP Start\n"); urx->start(); @@ -206,14 +207,8 @@ void GPS_Source::Open_USRP_V1() void GPS_Source::Close_USRP_V1() { - if(opt.verbose) - printf("Stopping USRP\n"); - urx->stop(); - if(opt.verbose) - printf("USRP Stopped\n"); - if(dbs_rx_a != NULL) delete dbs_rx_a; @@ -223,6 +218,9 @@ void GPS_Source::Close_USRP_V1() if(urx != NULL) delete urx; + if(opt.verbose) + fprintf(stdout,"Destructing USRP\n"); + } void GPS_Source::Read(ms_packet *_p) @@ -270,7 +268,7 @@ void GPS_Source::Read(ms_packet *_p) // { // time(&rawtime); // timeinfo = localtime (&rawtime); -// fprintf(stdout, "\nUSRP overflow at time %s",asctime (timeinfo)); +// ffprintf(stdout,stdout, "\nUSRP overflow at time %s",asctime (timeinfo)); // fflush(stdout); // } objects/gps_source.cpp @@ -36,17 +36,18 @@ void *Keyboard_Thread(void *_arg) while(grun) { - key = getchar(); - //printf("%c",(char)key); + + fprintf(stderr,"%c\n",(char)key); if((char)key == 'Q') { grun = 0x0; } - aKeyboard->IncExecTic(); + usleep(1000); + aKeyboard->IncExecTic(); } pthread_exit(0); @@ -61,7 +62,7 @@ void Keyboard::Start() Start_Thread(Keyboard_Thread, NULL); if(gopt.verbose) - printf("Keyboard thread started\n"); + fprintf(stdout,"Keyboard thread started\n"); } /*----------------------------------------------------------------------------------------------*/ @@ -70,7 +71,7 @@ void Keyboard::Start() Keyboard::Keyboard():Threaded_Object("KEYTASK") { if(gopt.verbose) - printf("Creating Keyboard\n"); + fprintf(stdout,"Creating Keyboard\n"); } /*----------------------------------------------------------------------------------------------*/ @@ -79,6 +80,6 @@ Keyboard::Keyboard():Threaded_Object("KEYTASK") Keyboard::~Keyboard() { if(gopt.verbose) - printf("Destructing Keyboard\n"); + fprintf(stdout,"Destructing Keyboard\n"); } /*----------------------------------------------------------------------------------------------*/ objects/keyboard.cpp @@ -30,7 +30,7 @@ void *PVT_Thread(void *_arg) { - while(1) + while(grun) { pPVT->Import(); pPVT->Navigate(); @@ -48,7 +48,7 @@ void PVT::Start() Start_Thread(PVT_Thread, NULL); if(gopt.verbose) - printf("PVT thread started\n"); + fprintf(stdout,"PVT thread started\n"); } /*----------------------------------------------------------------------------------------------*/ @@ -58,7 +58,7 @@ void PVT::Start() PVT::~PVT() { if(gopt.verbose) - printf("Destructing PVT\n"); + fprintf(stdout,"Destructing PVT\n"); } /*----------------------------------------------------------------------------------------------*/ @@ -75,7 +75,7 @@ PVT::PVT():Threaded_Object("PVTTASK") master_nav.stale_ticks = STALE_SPS_VALUE; if(gopt.verbose) - printf("Creating PVT\n"); + fprintf(stdout,"Creating PVT\n"); } /*----------------------------------------------------------------------------------------------*/ objects/pvt.cpp @@ -31,7 +31,7 @@ void *SV_Select_Thread(void *_arg) { - while(1) + while(grun) { pSV_Select->Import(); } @@ -49,7 +49,7 @@ void SV_Select::Start() Start_Thread(SV_Select_Thread, NULL); if(gopt.verbose) - printf("SV_Select thread started\n"); + fprintf(stdout,"SV_Select thread started\n"); } /*----------------------------------------------------------------------------------------------*/ @@ -81,7 +81,7 @@ SV_Select::SV_Select():Threaded_Object("SVSTASK") config.strong_operation = ACQ_OPERATION_STRONG; if(gopt.verbose) - printf("Creating SV Select\n"); + fprintf(stdout,"Creating SV Select\n"); } /*----------------------------------------------------------------------------------------------*/ @@ -91,7 +91,7 @@ SV_Select::SV_Select():Threaded_Object("SVSTASK") SV_Select::~SV_Select() { if(gopt.verbose) - printf("Destructing SV Select\n"); + fprintf(stdout,"Destructing SV Select\n"); } /*----------------------------------------------------------------------------------------------*/ objects/sv_select.cpp @@ -31,6 +31,7 @@ void lost_gui_pipe(int _sig) { pTelemetry->ClosePipe(); + fprintf(stderr,"GUI disconnected\n"); } /*----------------------------------------------------------------------------------------------*/ @@ -38,7 +39,7 @@ void lost_gui_pipe(int _sig) void *Telemetry_Thread(void *_arg) { - while(1) + while(grun) { pTelemetry->Import(); pTelemetry->Export(); @@ -55,7 +56,7 @@ void Telemetry::Start() Start_Thread(Telemetry_Thread, NULL); if(gopt.verbose) - printf("Telemetry thread started\n"); + fprintf(stdout,"Telemetry thread started\n"); } /*----------------------------------------------------------------------------------------------*/ @@ -68,7 +69,7 @@ Telemetry::Telemetry():Threaded_Object("TLMTASK") size = sizeof(Telemetry); npipe_open = false; - npipe[READ] = npipe[WRITE] = 0; + npipe[READ] = npipe[WRITE] = -1; pheader = (uint8 *)&command_header; pcommand = (uint8 *)&command_body; @@ -77,12 +78,12 @@ Telemetry::Telemetry():Threaded_Object("TLMTASK") remove("/tmp/GPS2GUI"); fifo[WRITE] = mkfifo("/tmp/GPS2GUI", S_IRWXG | S_IRWXU | S_IRWXO); if(fifo[WRITE] == -1) - printf("Error creating the named pipe"); + fprintf(stderr,"Error creating the named pipe /tmp/GPS2GUI\n"); remove("/tmp/GUI2GPS"); fifo[READ] = mkfifo("/tmp/GUI2GPS", S_IRWXG | S_IRWXU | S_IRWXO); if(fifo[READ] == -1) - printf("Error creating the named pipe"); + fprintf(stderr,"Error creating the named pipe /tmp/GUI2GPS\n"); /* Build the function pointer array */ msg_handlers[FIRST_M_ID] = NULL; @@ -145,7 +146,7 @@ Telemetry::Telemetry():Threaded_Object("TLMTASK") msg_rates[LAST_M_ID] = 0; if(gopt.verbose) - printf("Creating Telemetry\n"); + fprintf(stdout,"Creating Telemetry\n"); } /*----------------------------------------------------------------------------------------------*/ @@ -160,13 +161,26 @@ Telemetry::~Telemetry() remove("/tmp/GUI2GPS"); if(gopt.verbose) - printf("Destructing Telemetry\n"); + fprintf(stdout,"Destructing Telemetry\n"); } /*----------------------------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------------------------*/ +void Telemetry::SetType(int32 _type) +{ + if(_type == TELEM_NAMED_PIPE) + tlm_type = TELEM_NAMED_PIPE; + else + tlm_type = TELEM_SERIAL; + + ClosePipe(); +} +/*----------------------------------------------------------------------------------------------*/ + + +/*----------------------------------------------------------------------------------------------*/ void Telemetry::OpenSerial() { int32 spipe; @@ -175,14 +189,14 @@ void Telemetry::OpenSerial() spipe = open("/dev/ttyS0", O_RDWR | O_NOCTTY | O_NONBLOCK); if(spipe < 0) { - npipe[READ] = NULL; - npipe[WRITE] = NULL; + npipe[READ] = -1; + npipe[WRITE] = -1; npipe_open = false; return; } memset(&tty, 0x0, sizeof(tty)); //!< Initialize the port settings structure to all zeros - tty.c_cflag = B115200 | CS8 | CLOCAL | CREAD | CRTSCTS; //!< 8N1 + tty.c_cflag = B57600 | CLOCAL | CREAD | CS8; tty.c_iflag = IGNPAR; tty.c_oflag = 0; tty.c_lflag = 0; @@ -191,7 +205,7 @@ void Telemetry::OpenSerial() tcflush(spipe, TCIFLUSH); //!< Flush old data tcsetattr(spipe, TCSANOW, &tty); //!< Apply new settings - fcntl(spipe, F_SETFL, FASYNC); + fcntl(spipe, F_SETFL, FASYNC); //!< ??? fcntl(spipe, F_SETFL, O_NONBLOCK); //!< Nonblocking reads and writes /* Alias the serial port */ @@ -214,15 +228,15 @@ void Telemetry::OpenPipe() fcntl(npipe[READ] , F_SETFL, O_NONBLOCK); fcntl(npipe[WRITE] , F_SETFL, O_NONBLOCK); npipe_open = true; - printf("GUI connected\n"); + fprintf(stdout,"GUI connected\n"); } else { npipe_open = false; close(npipe[READ]); close(npipe[WRITE]); - npipe[READ] = NULL; - npipe[WRITE] = NULL; + npipe[READ] = -1; + npipe[WRITE] = -1; } } /*----------------------------------------------------------------------------------------------*/ @@ -234,8 +248,8 @@ void Telemetry::ClosePipe() npipe_open = false; close(npipe[READ]); close(npipe[WRITE]); - npipe[READ] = NULL; - npipe[WRITE] = NULL; + npipe[READ] = -1; + npipe[WRITE] = -1; } /*----------------------------------------------------------------------------------------------*/ @@ -275,7 +289,16 @@ void Telemetry::ImportPVT() { export_messages = true; if(npipe_open == false) - OpenPipe(); + { + if(tlm_type == TELEM_NAMED_PIPE) + { + OpenPipe(); + } + else + { + OpenSerial(); + } + } } bread = read(SVS_2_TLM_P[READ], &svs_s, sizeof(SVS_2_TLM_S)); objects/telemetry.cpp @@ -28,6 +28,12 @@ #ifndef TELEMETRY_H_ #define TELEMETRY_H_ +enum Telemetry_Type +{ + TELEM_NAMED_PIPE, + TELEM_SERIAL +}; + #include "includes.h" //#include "ekf.h" //!< The EKF driver //#include "idle.h" //!< Idle CPU counter @@ -63,12 +69,13 @@ class Telemetry : public Threaded_Object uint32 msg_rates[LAST_M_ID+1]; //!< Control output of periodic messages, 0 == off, !0 == decimation rate void (Telemetry::*msg_handlers[LAST_M_ID+1])(void); //!< Function pointers for periodic message handlers + int32 tlm_type; int32 fifo[2]; int32 npipe[2]; //!< Named pipe and/or serial interface int32 npipe_open; //!< Is the named pipe open!? - CCSDS_Packet_Header packet_header; //!< CCSDS Packet header - CCSDS_Packet_Header command_header; //!< CCSDS Command header + CCSDS_Packet_Header packet_header; //!< CCSDS Packet header + CCSDS_Packet_Header command_header; //!< CCSDS Command header CCSDS_Decoded_Header decoded_header; //!< Decoded header Command_Union command_body; //!< Body of a command @@ -99,6 +106,7 @@ class Telemetry : public Threaded_Object /* Default object methods */ Telemetry(); //!< Constructor ~Telemetry(); + void SetType(int32 _type); //!< Serial or named pipe void OpenPipe(); void OpenSerial(); void ClosePipe(); objects/telemetry.h @@ -105,7 +105,7 @@ void fill_prn_new(MIX *_vect, int32 _samps) int main(int32 argc, char* argv[]) { - printf("SIMD_Test\n"); + fprintf(stdout,"SIMD_Test\n"); CPX *testvecta; CPX *testvectb; @@ -168,9 +168,9 @@ int main(int32 argc, char* argv[]) } if(err) - printf("INT16 ADD \t\t\tFAILED: %d\n",err); + fprintf(stdout,"INT16 ADD \t\t\tFAILED: %d\n",err); else - printf("INT16 ADD \t\t\tPASSED\n",err); + fprintf(stdout,"INT16 ADD \t\t\tPASSED\n",err); /*----------------------------------------------------------------------------------------------*/ @@ -203,9 +203,9 @@ int main(int32 argc, char* argv[]) } if(err) - printf("INT16 SUB \t\t\tFAILED: %d\n",err); + fprintf(stdout,"INT16 SUB \t\t\tFAILED: %d\n",err); else - printf("INT16 SUB \t\t\tPASSED\n",err); + fprintf(stdout,"INT16 SUB \t\t\tPASSED\n",err); /*----------------------------------------------------------------------------------------------*/ @@ -237,9 +237,9 @@ int main(int32 argc, char* argv[]) } if(err) - printf("INT16 MUL \t\t\tFAILED: %d\n",err); + fprintf(stdout,"INT16 MUL \t\t\tFAILED: %d\n",err); else - printf("INT16 MUL \t\t\tPASSED\n",err); + fprintf(stdout,"INT16 MUL \t\t\tPASSED\n",err); /*----------------------------------------------------------------------------------------------*/ @@ -262,15 +262,15 @@ int main(int32 argc, char* argv[]) if(val1 != val2) { - printf("x86,SSE: %d,%d\n",val1,val2); + fprintf(stdout,"x86,SSE: %d,%d\n",val1,val2); err++; } } if(err) - printf("INT16 DOT \t\t\tFAILED: %d\n",err); + fprintf(stdout,"INT16 DOT \t\t\tFAILED: %d\n",err); else - printf("INT16 DOT \t\t\tPASSED\n",err); + fprintf(stdout,"INT16 DOT \t\t\tPASSED\n",err); /*----------------------------------------------------------------------------------------------*/ @@ -294,7 +294,7 @@ int main(int32 argc, char* argv[]) for(lcv2 = 0; lcv2 < pts; lcv2++) { - //printf("[%d,%d] [%d,%d]\n",testvecta[lcv2].i,testvecta[lcv2].q,testvectc[lcv2].i,testvectc[lcv2].q); + //fprintf(stdout,"[%d,%d] [%d,%d]\n",testvecta[lcv2].i,testvecta[lcv2].q,testvectc[lcv2].i,testvectc[lcv2].q); if(testvecta[lcv2].i != testvectc[lcv2].i) err++; @@ -305,9 +305,9 @@ int main(int32 argc, char* argv[]) } if(err) - printf("CPX CONJ \t\t\tFAILED: %d\n",err); + fprintf(stdout,"CPX CONJ \t\t\tFAILED: %d\n",err); else - printf("CPX CONJ \t\t\tPASSED\n",err); + fprintf(stdout,"CPX CONJ \t\t\tPASSED\n",err); /*----------------------------------------------------------------------------------------------*/ @@ -331,7 +331,7 @@ int main(int32 argc, char* argv[]) for(lcv2 = 0; lcv2 < pts; lcv2++) { - //printf("[%d,%d] [%d,%d]\n",testvecta[lcv2].i,testvecta[lcv2].q,testvectc[lcv2].i,testvectc[lcv2].q); + //fprintf(stdout,"[%d,%d] [%d,%d]\n",testvecta[lcv2].i,testvecta[lcv2].q,testvectc[lcv2].i,testvectc[lcv2].q); if(testvecta[lcv2].i != testvectc[lcv2].i) err++; @@ -342,9 +342,9 @@ int main(int32 argc, char* argv[]) } if(err) - printf("CPX MUL \t\t\tFAILED: %d\n",err); + fprintf(stdout,"CPX MUL \t\t\tFAILED: %d\n",err); else - printf("CPX MUL \t\t\tPASSED\n",err); + fprintf(stdout,"CPX MUL \t\t\tPASSED\n",err); /*----------------------------------------------------------------------------------------------*/ @@ -369,7 +369,7 @@ int main(int32 argc, char* argv[]) for(lcv2 = 0; lcv2 < pts; lcv2++) { - //printf("[%d,%d] [%d,%d]\n",testvecta[lcv2].i,testvecta[lcv2].q,testvectc[lcv2].i,testvectc[lcv2].q); + //fprintf(stdout,"[%d,%d] [%d,%d]\n",testvecta[lcv2].i,testvecta[lcv2].q,testvectc[lcv2].i,testvectc[lcv2].q); if(testvecta[lcv2].i != testvectc[lcv2].i) err++; @@ -380,9 +380,9 @@ int main(int32 argc, char* argv[]) } if(err) - printf("CPX MUL SHIFT \t\t\tFAILED: %d\n",err); + fprintf(stdout,"CPX MUL SHIFT \t\t\tFAILED: %d\n",err); else - printf("CPX MUL SHIFT \t\t\tPASSED\n",err); + fprintf(stdout,"CPX MUL SHIFT \t\t\tPASSED\n",err); /*----------------------------------------------------------------------------------------------*/ @@ -406,7 +406,7 @@ int main(int32 argc, char* argv[]) for(lcv2 = 0; lcv2 < pts; lcv2++) { - //printf("[%d,%d] [%d,%d]\n",testvecta[lcv2].i,testvecta[lcv2].q,testvectc[lcv2].i,testvectc[lcv2].q); + //fprintf(stdout,"[%d,%d] [%d,%d]\n",testvecta[lcv2].i,testvecta[lcv2].q,testvectc[lcv2].i,testvectc[lcv2].q); if(testvectc[lcv2].i != testvectd[lcv2].i) err++; @@ -417,9 +417,9 @@ int main(int32 argc, char* argv[]) } if(err) - printf("CPX MUL SHIFT PRESERVE \t\tFAILED: %d\n",err); + fprintf(stdout,"CPX MUL SHIFT PRESERVE \t\tFAILED: %d\n",err); else - printf("CPX MUL SHIFT PRESERVE \t\tPASSED\n",err); + fprintf(stdout,"CPX MUL SHIFT PRESERVE \t\tPASSED\n",err); /*----------------------------------------------------------------------------------------------*/ @@ -444,21 +444,21 @@ int main(int32 argc, char* argv[]) if(ai1 != ai2) { - printf("Low32: %8x,%8x\n",ai1, ai2); + fprintf(stdout,"Low32: %8x,%8x\n",ai1, ai2); err++; } if(aq1 != aq2) { - printf("High32: %8x,%8x\n",aq1, aq2); + fprintf(stdout,"High32: %8x,%8x\n",aq1, aq2); err++; } } if(err) - printf("CPX ACCUM \t\t\tFAILED: %d\n",err); + fprintf(stdout,"CPX ACCUM \t\t\tFAILED: %d\n",err); else - printf("CPX ACCUM \t\t\tPASSED\n",err); + fprintf(stdout,"CPX ACCUM \t\t\tPASSED\n",err); /*----------------------------------------------------------------------------------------------*/ /* SIMD x86_prn_accum */ @@ -495,14 +495,14 @@ int main(int32 argc, char* argv[]) if(err) { for(lcv2 = 0; lcv2 < 3; lcv2++) - printf("%d.%d,%d.%d\n",accuma[lcv2].i,accuma[lcv2].q,accumb[lcv2].i,accumb[lcv2].q); + fprintf(stdout,"%d.%d,%d.%d\n",accuma[lcv2].i,accuma[lcv2].q,accumb[lcv2].i,accumb[lcv2].q); } } if(err) - printf("CPX PRN ACCUM \t\t\tFAILED: %d\n",err); + fprintf(stdout,"CPX PRN ACCUM \t\t\tFAILED: %d\n",err); else - printf("CPX PRN ACCUM \t\t\tPASSED\n",err); + fprintf(stdout,"CPX PRN ACCUM \t\t\tPASSED\n",err); /*----------------------------------------------------------------------------------------------*/ @@ -539,14 +539,14 @@ int main(int32 argc, char* argv[]) if(err) { for(lcv2 = 0; lcv2 < 3; lcv2++) - printf("%d.%d,%d.%d\n",caccuma[lcv2].i,caccuma[lcv2].q,caccumb[lcv2].i,caccumb[lcv2].q); + fprintf(stdout,"%d.%d,%d.%d\n",caccuma[lcv2].i,caccuma[lcv2].q,caccumb[lcv2].i,caccumb[lcv2].q); } } if(err) - printf("CPX PRN ACCUM NEW \t\tFAILED: %d\n",err); + fprintf(stdout,"CPX PRN ACCUM NEW \t\tFAILED: %d\n",err); else - printf("CPX PRN ACCUM NEW\t\tPASSED\n",err); + fprintf(stdout,"CPX PRN ACCUM NEW\t\tPASSED\n",err); /*----------------------------------------------------------------------------------------------*/ delete [] testvecta; simd/simd-test.cpp @@ -51,7 +51,7 @@ typedef struct _options /*----------------------------------------------------------------------------------------------*/ -void PostStatus(char *_str) {fprintf(stdout,"%s",_str); fflush(stdout);} +void PostStatus(char *_str) {ffprintf(stdout,stdout,"%s",_str); fflush(stdout);} void *record_thread(void *_opt); void *fifo_thread(void *_opt); void *key_thread(void *_arg); @@ -76,15 +76,15 @@ pthread_mutex_t mFIFO; void usage(char *_str) { - fprintf(stderr, "usage: [-gr] [-gi] [-d] [-l] [-w] [-v] [-c]\n"); - fprintf(stderr, "[-gr] <gain> set rf gain in dB (DBSRX only)\n"); - fprintf(stderr, "[-gi] <gain> set if gain in dB (DBSRX only)\n"); - fprintf(stderr, "[-d] operate in two antenna mode, A & B as L1\n"); - fprintf(stderr, "[-l] operate in L1-L2 mode, A as L1, B as L2\n"); - fprintf(stderr, "[-w] <bandwidth> bandwidth of lowpass filter\n"); - fprintf(stderr, "[-v] output extra debug info\n"); - fprintf(stderr, "[-r] dump data to disk\n"); - fprintf(stderr, "[-c] the USRP samples at a modified 65.536 MHz (default is 64 MHz)\n"); + fprintf(stderr,"usage: [-gr] [-gi] [-d] [-l] [-w] [-v] [-c]\n"); + fprintf(stderr,"[-gr] <gain> set rf gain in dB (DBSRX only)\n"); + fprintf(stderr,"[-gi] <gain> set if gain in dB (DBSRX only)\n"); + fprintf(stderr,"[-d] operate in two antenna mode, A & B as L1\n"); + fprintf(stderr,"[-l] operate in L1-L2 mode, A as L1, B as L2\n"); + fprintf(stderr,"[-w] <bandwidth> bandwidth of lowpass filter\n"); + fprintf(stderr,"[-v] output extra debug info\n"); + fprintf(stderr,"[-r] dump data to disk\n"); + fprintf(stderr,"[-c] the USRP samples at a modified 65.536 MHz (default is 64 MHz)\n"); fflush(stderr); exit(1); @@ -101,35 +101,35 @@ int echo_options(options *_opt) usrp_standard_rx *urx = usrp_standard_rx::make(0, 8, 1, -1, 0, 0, 0); if(urx == NULL) { - printf("usrp_standard_rx::make FAILED\n"); + fprintf(stdout,"usrp_standard_rx::make FAILED\n"); return(-1); } switch(urx->daughterboard_id(0)) { case 1: - fprintf(stdout,"Board A:\t\t\tBasic RX\n"); break; + ffprintf(stdout,stdout,"Board A:\t\t\tBasic RX\n"); break; case 2: - fprintf(stdout,"Board A:\t\t\t DBS RX\n"); break; + ffprintf(stdout,stdout,"Board A:\t\t\t DBS RX\n"); break; default: - fprintf(stdout,"Board A:\t\t\tUnknown\n"); break; + ffprintf(stdout,stdout,"Board A:\t\t\tUnknown\n"); break; } switch(urx->daughterboard_id(1)) { case 1: - fprintf(stdout,"Board B:\t\t\tBasic RX\n"); break; + ffprintf(stdout,stdout,"Board B:\t\t\tBasic RX\n"); break; case 2: - fprintf(stdout,"Board B:\t\t\t DBS RX\n"); break; + ffprintf(stdout,stdout,"Board B:\t\t\t DBS RX\n"); break; default: - fprintf(stdout,"Board B:\t\t\tUnknown\n"); break; + ffprintf(stdout,stdout,"Board B:\t\t\tUnknown\n"); break; } switch(_opt->mode) { - case 0: fprintf(stdout, "Single L1 mode (L1->A)\n"); break; - case 1: fprintf(stdout, "Dual L1 mode (L1->A L1->B)\n"); break; - case 2: fprintf(stdout, "Dual L1-L2C mode (L1->A L2C->B)\n"); break; + case 0: ffprintf(stdout,stdout, "Single L1 mode (L1->A)\n"); break; + case 1: ffprintf(stdout,stdout, "Dual L1 mode (L1->A L1->B)\n"); break; + case 2: ffprintf(stdout,stdout, "Dual L1-L2C mode (L1->A L2C->B)\n"); break; } /* Error check based on the mode */ @@ -138,7 +138,7 @@ int echo_options(options *_opt) case 0: if(urx->daughterboard_id(0) != 2) { - fprintf(stdout, "Board A is not a DBS-RX!\n"); + ffprintf(stdout,stdout, "Board A is not a DBS-RX!\n"); delete urx; return(-1); } @@ -146,14 +146,14 @@ int echo_options(options *_opt) case 1: if(urx->daughterboard_id(0) != 2) { - fprintf(stdout, "Board A is not a DBS-RX!\n"); + ffprintf(stdout,stdout, "Board A is not a DBS-RX!\n"); delete urx; return(-1); } if(urx->daughterboard_id(1) != 2) { - fprintf(stdout, "Board B is not a DBS-RX!\n"); + ffprintf(stdout,stdout, "Board B is not a DBS-RX!\n"); delete urx; return(-1); } @@ -161,32 +161,32 @@ int echo_options(options *_opt) case 2: if(urx->daughterboard_id(0) != 2) { - fprintf(stdout, "Board A is not a DBS-RX!\n"); + ffprintf(stdout,stdout, "Board A is not a DBS-RX!\n"); delete urx; return(-1); } if(urx->daughterboard_id(1) != 2) { - fprintf(stdout, "Board B is not a DBS-RX!\n"); + ffprintf(stdout,stdout, "Board B is not a DBS-RX!\n"); delete urx; return(-1); } break; default: - fprintf(stdout, "_opt->mode non-valid\n"); + ffprintf(stdout,stdout, "_opt->mode non-valid\n"); delete urx; return(-1); } - fprintf(stdout, "USRP Sample Rate:\t% 15.2f\n",_opt->f_sample); - fprintf(stdout, "USRP Decimation:\t% 15d\n",_opt->decimate); - fprintf(stdout, "DBSRX LO A:\t\t% 15.2f\n",_opt->f_lo_a); - fprintf(stdout, "DBSRX LO B:\t\t% 15.2f\n",_opt->f_lo_b); - fprintf(stdout, "RF Gain:\t\t% 15.2f\n",_opt->gr); - fprintf(stdout, "IF Gain:\t\t% 15.2f\n",_opt->gi); - fprintf(stdout, "DBSRX Bandwidth:\t% 15.2f\n",_opt->bandwidth); + ffprintf(stdout,stdout, "USRP Sample Rate:\t% 15.2f\n",_opt->f_sample); + ffprintf(stdout,stdout, "USRP Decimation:\t% 15d\n",_opt->decimate); + ffprintf(stdout,stdout, "DBSRX LO A:\t\t% 15.2f\n",_opt->f_lo_a); + ffprintf(stdout,stdout, "DBSRX LO B:\t\t% 15.2f\n",_opt->f_lo_b); + ffprintf(stdout,stdout, "RF Gain:\t\t% 15.2f\n",_opt->gr); + ffprintf(stdout,stdout, "IF Gain:\t\t% 15.2f\n",_opt->gi); + ffprintf(stdout,stdout, "DBSRX Bandwidth:\t% 15.2f\n",_opt->bandwidth); delete urx; @@ -327,15 +327,15 @@ int main(int argc, char **argv) // tparam.sched_priority = sched_get_priority_max(SCHED_FIFO); // if(pthread_setschedparam(precord_thread, SCHED_FIFO, &tparam)) -// fprintf(stdout,"Could not elevate priority of USRP thread\n"); +// ffprintf(stdout,stdout,"Could not elevate priority of USRP thread\n"); // tparam.sched_priority = sched_get_priority_max(SCHED_FIFO); // if(pthread_setschedparam(pfifo_thread, SCHED_FIFO, &tparam)) -// fprintf(stdout,"Could not elevate priority of FIFO thread\n"); +// ffprintf(stdout,stdout,"Could not elevate priority of FIFO thread\n"); // // tparam.sched_priority = sched_get_priority_max(SCHED_FIFO); // if(pthread_setschedparam(pkey_thread, SCHED_FIFO, &tparam)) -// fprintf(stdout,"Could not elevate priority of KEY thread\n"); +// ffprintf(stdout,stdout,"Could not elevate priority of KEY thread\n"); while(grun) { @@ -388,7 +388,7 @@ void *record_thread(void *opt) if(urx == NULL) { if(_opt->verbose) - printf("usrp_standard_rx::make FAILED\n"); + fprintf(stderr,"usrp_standard_rx::make FAILED\n"); pthread_exit(0); } @@ -437,13 +437,13 @@ void *record_thread(void *opt) if(_opt->verbose) { - printf("DBS-RX A Configuration\n"); - printf("DBS-RX A BW: \t\t% 15.2f\n",dbs_rx_a->bw()); - printf("DBS-RX A LO: \t\t% 15.2f\n",dbs_rx_a->freq()); - printf("DBS-RX A IF Gain: \t% 15.2f\n",dbs_rx_a->if_gain()); - printf("DBS-RX A RF Gain: \t% 15.2f\n",dbs_rx_a->rf_gain()); - printf("DDC 0: \t\t\t% 15.2f\n",urx->rx_freq(0)); - //printf("DBS-RX A Diff: \t\t%f\n",dbs_rx_a->freq()-_opt->f_lo_a); + fprintf(stdout,"DBS-RX A Configuration\n"); + fprintf(stdout,"DBS-RX A BW: \t\t% 15.2f\n",dbs_rx_a->bw()); + fprintf(stdout,"DBS-RX A LO: \t\t% 15.2f\n",dbs_rx_a->freq()); + fprintf(stdout,"DBS-RX A IF Gain: \t% 15.2f\n",dbs_rx_a->if_gain()); + fprintf(stdout,"DBS-RX A RF Gain: \t% 15.2f\n",dbs_rx_a->rf_gain()); + fprintf(stdout,"DDC 0: \t\t\t% 15.2f\n",urx->rx_freq(0)); + //fprintf(stdout,"DBS-RX A Diff: \t\t%f\n",dbs_rx_a->freq()-_opt->f_lo_a); } @@ -491,20 +491,20 @@ void *record_thread(void *opt) if(_opt->verbose) { - printf("DBS-RX B Actual Configuration\n"); - printf("DBS-RX B BW: \t\t% 15.2f\n",dbs_rx_b->bw()); - printf("DBS-RX B LO: \t\t% 15.2f\n",dbs_rx_b->freq()); - printf("DBS-RX B IF Gain: \t% 15.2f\n",dbs_rx_b->if_gain()); - printf("DBS-RX B RF Gain: \t% 15.2f\n",dbs_rx_b->rf_gain()); - printf("DDC 1: \t\t\t% 15.2f\n",urx->rx_freq(1)); - //printf("DBS-RX B Diff: \t\t%f\n",dbs_rx_b->freq()-_opt->f_lo_b); + fprintf(stdout,"DBS-RX B Actual Configuration\n"); + fprintf(stdout,"DBS-RX B BW: \t\t% 15.2f\n",dbs_rx_b->bw()); + fprintf(stdout,"DBS-RX B LO: \t\t% 15.2f\n",dbs_rx_b->freq()); + fprintf(stdout,"DBS-RX B IF Gain: \t% 15.2f\n",dbs_rx_b->if_gain()); + fprintf(stdout,"DBS-RX B RF Gain: \t% 15.2f\n",dbs_rx_b->rf_gain()); + fprintf(stdout,"DDC 1: \t\t\t% 15.2f\n",urx->rx_freq(1)); + //fprintf(stdout,"DBS-RX B Diff: \t\t%f\n",dbs_rx_b->freq()-_opt->f_lo_b); } } } /* Start collecting data */ - printf("USRP Start\n"); + fprintf(stdout,"USRP Start\n"); urx->start(); @@ -538,26 +538,26 @@ void *record_thread(void *opt) { time(&rawtime); timeinfo = localtime (&rawtime); - fprintf(stdout, "\nOverflow at time %s",asctime (timeinfo)); + ffprintf(stdout,stdout, "\nOverflow at time %s",asctime (timeinfo)); fflush(stdout); } } if(_opt->verbose) - printf("Stopping USRP\n"); + fprintf(stdout,"Stopping USRP\n"); urx->stop(); if(_opt->verbose) - printf("USRP Stopped\n"); + fprintf(stdout,"USRP Stopped\n"); if(_opt->verbose) - printf("Closing pipe\n"); + fprintf(stdout,"Closing pipe\n"); close(npipe); if(_opt->verbose) - printf("Pipe closed\n"); + fprintf(stdout,"Pipe closed\n"); if(dbs_rx_a != NULL) delete dbs_rx_a; @@ -580,7 +580,7 @@ int fifo_pipe; void wait_for_client() { - printf("Waiting for client\n"); + fprintf(stdout,"Waiting for client\n"); fifo_pipe = -1; while((fifo_pipe == -1) && grun) { @@ -589,10 +589,10 @@ void wait_for_client() } if(fifo_pipe != -1) - printf("Client connected\n"); + fprintf(stdout,"Client connected\n"); else { - printf("Killed before client connected\n"); + fprintf(stdout,"Killed before client connected\n"); pthread_exit(0); } @@ -650,13 +650,13 @@ void *fifo_thread(void *arg) lcv = 0; if(_opt->verbose) - printf("FIFO thread start\n"); + fprintf(stdout,"FIFO thread start\n"); /* Everything set, now create a disk thread & pipe, and do some recording! */ remove("/tmp/GPSPIPE"); fifo = mkfifo("/tmp/GPSPIPE", S_IRWXG | S_IRWXU | S_IRWXO); if ((fifo == -1) && (errno != EEXIST)) - printf("Error creating the named pipe"); + fprintf(stdout,"Error creating the named pipe"); /* Wait for the gps-sdr */ wait_for_client(); @@ -776,7 +776,7 @@ void *fifo_thread(void *arg) sem_getvalue(&mFILLED, &filled); sem_getvalue(&mEMPTY, &empty); - fprintf(stdout,"FIFO Filled\\Empty: %4d,%4d \r",filled,empty); + ffprintf(stdout,stdout,"FIFO Filled\\Empty: %4d,%4d \r",filled,empty); fflush(stdout); lcv = 0; } @@ -791,7 +791,7 @@ void *fifo_thread(void *arg) fclose(fp_out); if(_opt->verbose) - printf("FIFO thread stop\n"); + fprintf(stdout,"FIFO thread stop\n"); pthread_exit(0); @@ -808,7 +808,7 @@ void *key_thread(void *_arg) char key; if(_opt->verbose) - printf("Key thread start\n"); + fprintf(stdout,"Key thread start\n"); while(grun) { @@ -822,7 +822,7 @@ void *key_thread(void *_arg) } if(_opt->verbose) - printf("Key thread stop\n"); + fprintf(stdout,"Key thread stop\n"); pthread_exit(0); @@ -834,7 +834,7 @@ void *key_thread(void *_arg) void kill_program(int _sig) { //grun = false; - printf("Lost GPS-SDR!\n"); + fprintf(stdout,"Lost GPS-SDR!\n"); wait_for_client(); } /*----------------------------------------------------------------------------------------------*/ usrp/gps-usrp.cpp 8042ad7dd051aab2fd0613421ebda50a56bcde6f Gregory W. Heckler gheckler@gs-mesa3079693.(none) http://github.com/gps-sdr/gps-sdr/commit/f4dcf08d7b3b2f6103c223e602aa68fa08a0e82a f4dcf08d7b3b2f6103c223e602aa68fa08a0e82a 2009-06-01T14:55:25-07:00 2009-06-01T14:55:25-07:00 Fixed a bug with the named pipe and a conflict with stdin. 620e89541a02b2f6635526f3766000e668a1fc53 Gregory W. Heckler gheckler@gs-mesa3079693.(none)