Index: /branches/BNC_2.12/src/RTCM3/RTCM3Decoder.cpp
===================================================================
--- /branches/BNC_2.12/src/RTCM3/RTCM3Decoder.cpp	(revision 9215)
+++ /branches/BNC_2.12/src/RTCM3/RTCM3Decoder.cpp	(revision 9216)
@@ -1023,4 +1023,5 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
+    eph._receptStaID = _staID;    
 
     GETBITS(i, 6)
@@ -1100,5 +1101,6 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
-
+    eph._receptStaID = _staID;
+    
     GETBITS(sv, 6)
     eph._prn.set('R', sv);
@@ -1224,5 +1226,6 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
-
+    eph._receptStaID = _staID;
+    
     GETBITS(i, 4)
     eph._prn.set('J', i);
@@ -1306,5 +1309,6 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
-
+    eph._receptStaID = _staID;
+    
     GETBITS(i, 6)
     eph._prn.set('I', i);
@@ -1396,5 +1400,6 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
-
+    eph._receptStaID = _staID;
+    
     GETBITS(i, 6)
     eph._prn.set('S', 20 + i);
@@ -1450,5 +1455,6 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
-
+    eph._receptStaID = _staID;
+    
     eph._inav = (i == 1046);
     eph._fnav = (i == 1045);
@@ -1555,5 +1561,6 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
-
+    eph._receptStaID = _staID;
+    
     GETBITS(i, 6)
     eph._prn.set('C', i);
Index: /branches/BNC_2.12/src/bnccore.cpp
===================================================================
--- /branches/BNC_2.12/src/bnccore.cpp	(revision 9215)
+++ /branches/BNC_2.12/src/bnccore.cpp	(revision 9216)
@@ -202,13 +202,19 @@
   t_irc ircPut = _ephUser.putNewEph(eph, true);
   if      (eph->checkState() == t_eph::bad) {
-    messagePrivate("WRONG EPHEMERIS\n" + eph->toString(3.0).toAscii());
+    messagePrivate(QString("WRONG EPHEMERIS %1 received from %2 (%4)")
+                   .arg(eph->prn().toString().c_str()).arg(eph->receptStaID())
+                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 3.0)).toAscii());
     return failure;
   }
   else if (eph->checkState() == t_eph::outdated) {
-    messagePrivate("OUTDATED EPHEMERIS\n" + eph->toString(3.0).toAscii());
+    messagePrivate(QString("OUTDATED EPHEMERIS %1 received from %2 (%4)")
+                   .arg(eph->prn().toString().c_str()).arg(eph->receptStaID())
+                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 3.0)).toAscii());
     return failure;
   }
   else if (eph->checkState() == t_eph::unhealthy) {
-    messagePrivate("UNHEALTHY EPHEMERIS\n" + eph->toString(3.0).toLatin1());
+    messagePrivate(QString("UNHEALTHY EPHEMERIS %1 received from %2 (%4)")
+                   .arg(eph->prn().toString().c_str()).arg(eph->receptStaID())
+                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 3.0)).toAscii());
   }
   printEphHeader();
Index: /branches/BNC_2.12/src/ephemeris.h
===================================================================
--- /branches/BNC_2.12/src/ephemeris.h	(revision 9215)
+++ /branches/BNC_2.12/src/ephemeris.h	(revision 9216)
@@ -37,4 +37,5 @@
   void    setClkCorr(const t_clkCorr* clkCorr);
   const QDateTime& receptDateTime() const {return _receptDateTime;}
+    const QString receptStaID() const {return _receptStaID;}
   static QString rinexDateStr(const bncTime& tt, const t_prn& prn, double version);
   static QString rinexDateStr(const bncTime& tt, const QString& prnStr, double version);
@@ -47,4 +48,5 @@
   bncTime      _TOC;
   QDateTime    _receptDateTime;
+  QString      _receptStaID;
   e_checkState _checkState;
   t_orbCorr*   _orbCorr;
@@ -87,4 +89,5 @@
     _TOT              = 0.0;
     _fitInterval      = 0.0;
+    _receptStaID      = "";
   }
   t_ephGPS(float rnxVersion, const QStringList& lines);
@@ -187,4 +190,5 @@
     _M_tau_GPS        = 0.0;
     _M_l5             = 0.0;
+    _receptStaID      = "";    
   }
   t_ephGlo(float rnxVersion, const QStringList& lines);
@@ -279,4 +283,5 @@
     _BGD_1_5B        = 0.0;
     _TOT             = 0.0;
+    _receptStaID     = "";    
   };
   t_ephGal(float rnxVersion, const QStringList& lines);
@@ -359,4 +364,5 @@
     _ura            = 0.0;
     _health         = 0.0;
+    _receptStaID    = "";    
   }
   t_ephSBAS(float rnxVersion, const QStringList& lines);
@@ -426,4 +432,5 @@
    _TOEsec          = 0.0;
    _TOEweek         =-1.0;
+    _receptStaID    = "";   
  }
  t_ephBDS(float rnxVersion, const QStringList& lines);
Index: /branches/BNC_2.12/src/src.pri
===================================================================
--- /branches/BNC_2.12/src/src.pri	(revision 9215)
+++ /branches/BNC_2.12/src/src.pri	(revision 9216)
@@ -27,4 +27,5 @@
 debug:DEFINES  += BNC_DEBUG_BCEP
 #debug:DEFINES  += BNC_DEBUG_SSR
+release:DEFINES += BNC_DEBUG_BCEP
 
 # Include Path