gps-gse gps-sdr @@ -34,7 +34,7 @@ /*----------------------------------------------------------------------------------------------*/ #define SOFTWARE_VERSION_MAJOR (2) #define SOFTWARE_VERSION_MINOR (6) -#define SOFTWARE_VERSION_POSTFIX (0) +#define SOFTWARE_VERSION_POSTFIX (1) /*----------------------------------------------------------------------------------------------*/ /* The most important thing, the NUMBER OF CORRELATORS IN THE RECEIVER and the NUMBER OF CPUs */ includes/config.h @@ -477,7 +477,7 @@ void GPS_Source::Read_USRP_V1(ms_packet *_p) void GPS_Source::Read_GN3S(ms_packet *_p) { - int bread; + int32 bread, started, check; bool overrun; int32 ms_mod5; int32 lcv; @@ -489,7 +489,18 @@ void GPS_Source::Read_GN3S(ms_packet *_p) if(ms_count == 0) { /* Start transfer */ - gn3s_a->usrp_xfer(VRQ_XFER, 1); + while(!started) + { + started = gn3s_a->usrp_xfer(VRQ_XFER, 1); + } + + /* Make sure we are reading I0,Q0,I1,Q1,I2,Q2.... etc */ + bread = gn3s_a->read((void*)(&gbuff[0]),1); + check = (gbuff[0] & 0x3); //0 or 1 -> I sample , 2 or 3 -> Q sample + if(check < 2) + { + bread = gn3s_a->read((void*)(&gbuff[0]),1); + } } /* Do the GN3S reading */ objects/gps_source.cpp 42f84616d0c3cb54dbd1aa0d11680bc1c58bc390 gpssim gpssim@gpsdevc.(none) http://github.com/gps-sdr/gps-sdr/commit/1928a4b12d90999b9b18ddd695e71e282a556ec7 1928a4b12d90999b9b18ddd695e71e282a556ec7 2009-07-27T17:11:07-07:00 2009-07-27T17:11:07-07:00 Added a bug fix to the GN3S code, properly reading I and Q samples from the device (they could possibly be swapped). cd9fe5c55d7bdfb1b312633f97e6d80c90edb839 gpssim gpssim@gpsdevc.(none)