Index: trunk/BNC/src/ephemeris.cpp
===================================================================
--- trunk/BNC/src/ephemeris.cpp	(revision 6615)
+++ trunk/BNC/src/ephemeris.cpp	(revision 6616)
@@ -1478,14 +1478,14 @@
   _receptDateTime = currentDateAndTimeGPS();
 
-  _prn.set('C', ee->satellite);
-
-  _TOE_bdt.set(ee->BDSweek, ee->TOE);
-  _TOE             = _TOE_bdt + 14.0;
-
-  _TOC_bdt.set(ee->BDSweek, ee->TOC);
-  _TOC             = _TOC_bdt + 14.0;
-
-  _AODE            = ee->AODE;
-  _AODC            = ee->AODC;
+  _prn.set('C', ee->satellite - PRN_BDS_START + 1);
+
+  _TOE_bdt.set(1356 + ee->BDSweek, ee->TOE);
+  _TOE   = _TOE_bdt + 14.0;
+
+  _TOC_bdt.set(1356 + ee->BDSweek, ee->TOC);
+  _TOC   = _TOC_bdt + 14.0;
+
+  _AODE  = ee->AODE;
+  _AODC  = ee->AODC;
 
   _clock_bias      = ee->clock_bias;
@@ -1702,6 +1702,7 @@
   out << QString(fmt)
     .arg(_TOE_bdt.gpssec(), 19, 'e', 12)
-    .arg(double(_AODC),     19, 'e', 12);
-
+    .arg(double(_AODC),     19, 'e', 12)
+    .arg("",                19, QChar(' '))
+    .arg("",                19, QChar(' '));
   return rnxStr;
 }