Changeset 10535 for trunk/FACT++

Timestamp:

05/03/11 18:22:01 (14 years ago)

Author:

tbretz

Message:

Added more details to Error.

Location:

trunk/FACT++/src

Files:

• HeadersFTM.cc (modified) (1 diff)
• HeadersFTM.h (modified) (4 diffs)

trunk/FACT++/src/HeadersFTM.cc

@@ -133 +133 @@
 void FTM::Error::print(std::ostream &out) const
 {
-    out << "ERROR: Ncalls=" << fNumCalls << endl;
-    out << Converter::GetHex<unsigned int>(fData, 28, 0, false) << endl;
+    out << dec;
+    out << "ERROR: Num Calls   = " << fNumCalls << endl;
+    out << "       Delimiter   = " << (fDelimiter=='@'?"ok":"wrong") << endl;
+    out << "       Path        = ";
+    out << (fSrcAddress &0x3) << ":" << (fSrcAddress >>2) << " --> ";
+    out << (fDestAddress&0x3) << ":" << (fDestAddress>>2) << endl;
+    out << "       FirmwareId  = " << hex << fFirmwareId << endl;
+    out << "       Command     = " << hex << fCommand << endl;
+    out << "       CRC counter = " << dec << fCrcErrorCounter << endl;
+    out << "       CRC         = " << hex << fCrcCheckSum << endl;
+    out << "       Data: " << Converter::GetHex<unsigned int>(fData, 21, 0, false) << endl;
 }

trunk/FACT++/src/HeadersFTM.h

@@ -319 +319 @@
         std::vector<uint16_t> HtoN() const
         {
-            std::cout << "-----><-----" << std::endl;
             return htoncpy(*this);
         }
@@ -325 +324 @@
         void operator=(const std::vector<uint16_t> &vec)
         {
-            std::cout << "-----<>-----" << std::endl;
-
             ntohcpy(vec, *this);
         }
@@ -606 +603 @@
     struct Error
     {
-                              //  (same as FtuList)
         uint16_t fNumCalls;   // 0=error, >1 needed repetition but successfull
-        uint16_t fData[28];
+
+        uint16_t fDelimiter;
+        uint16_t fDestAddress;
+        uint16_t fSrcAddress;
+        uint16_t fFirmwareId;
+        uint16_t fCommand;
+        uint16_t fData[21];
+        uint16_t fCrcErrorCounter;
+        uint16_t fCrcCheckSum;
 
         Error() { init(*this); }
@@ -637 +641 @@
             fError(e)
         {
-        }
+            fError.fDestAddress = (e.fDestAddress&0x3)*10 + ((e.fDestAddress>>2)&0xf);
+            fError.fSrcAddress  = (e.fSrcAddress &0x3)*10 + ((e.fSrcAddress >>2)&0xf);
+        }
+
     }  __attribute__((__packed__));