/[PAMELA software]/yoda/techmodel/TmtcReader.cpp
ViewVC logotype

Diff of /yoda/techmodel/TmtcReader.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2.4 by kusanagi, Fri Dec 17 18:02:37 2004 UTC revision 2.5 by kusanagi, Mon Dec 20 14:15:13 2004 UTC
# Line 1  Line 1 
1  /** @file  /** @file
2   * $Source: /home/cvsmanager/yoda/techmodel/TmtcReader.cpp,v $   * $Source: /home/cvsmanager/yoda/techmodel/TmtcReader.cpp,v $
3   * $Id: TmtcReader.cpp,v 2.3 2004/12/17 12:46:20 kusanagi Exp $   * $Id: TmtcReader.cpp,v 2.4 2004/12/17 18:02:37 kusanagi Exp $
4   * $Author: kusanagi $   * $Author: kusanagi $
5   *   *
6   * Implementation of the TmtcReader class.   * Implementation of the TmtcReader class.
# Line 40  TmtcReader::TmtcReader(void): Line 40  TmtcReader::TmtcReader(void):
40   */   */
41  std::string TmtcReader::GetVersionInfo(void) const {  std::string TmtcReader::GetVersionInfo(void) const {
42    return    return
43      "$Header: /home/cvsmanager/yoda/techmodel/TmtcReader.cpp,v 2.3 2004/12/17 12:46:20 kusanagi Exp $\n";      "$Header: /home/cvsmanager/yoda/techmodel/TmtcReader.cpp,v 2.4 2004/12/17 18:02:37 kusanagi Exp $\n";
44  }  }
45    
46  /**  /**
# Line 57  void TmtcReader::Init(PamelaRun *run) { Line 57  void TmtcReader::Init(PamelaRun *run) {
57   */   */
58  void TmtcReader::RunEvent(int EventNumber, long int length) throw (WrongCRCException){  void TmtcReader::RunEvent(int EventNumber, long int length) throw (WrongCRCException){
59    
 /*  
 //Just to test crc  
   char tempbuff[length];  
   InputFile->read(tempbuff, sizeof(tempbuff));  
   UINT16 subCRC = 0;  
   for (int jj = 0; jj < length ; jj++){  
     subCRC = CM_Compute_CRC16(subCRC, (BYTE*)(tempbuff+jj), 1);  
   }  
 //Just to test crc  
 */  
   
60      int i, j;      int i, j;
61      char subData[TMTC_SUB_LENGTH];      char subData[TMTC_SUB_LENGTH];
62      char CRCbuff[TMTC_SUBCRC_LENGTH];      char CRCbuff[TMTC_SUBCRC_LENGTH];
# Line 82  void TmtcReader::RunEvent(int EventNumbe Line 71  void TmtcReader::RunEvent(int EventNumbe
71      UINT16    partialCRC = 0; //partial CRC updated as mcmd packet is read (to compare with the last two bytes of this event)      UINT16    partialCRC = 0; //partial CRC updated as mcmd packet is read (to compare with the last two bytes of this event)
72      UINT16    readCRC = 0;    //partial CRC updated as mcmd packet is read (to compare with the last two bytes of this event)      UINT16    readCRC = 0;    //partial CRC updated as mcmd packet is read (to compare with the last two bytes of this event)
73            
 /*    char tempData[length-TMTC_CRC_LENGTH];  
     InputFile->read(tempData, sizeof(tempData));  
     partialCRC = CM_Compute_CRC16(0, (UINT8*)tempData, (length-TMTC_CRC_LENGTH));  
 */  
   
74      for(i = 0; i < numRecords; i++) {      for(i = 0; i < numRecords; i++) {
75          start = InputFile->tellg();          start = InputFile->tellg();
76          InputFile->read(subData, sizeof(subData));          InputFile->read(subData, sizeof(subData));
77          InputFile->read(CRCbuff, sizeof(CRCbuff));          InputFile->read(CRCbuff, sizeof(CRCbuff));
78                    
     /*    for (int jj = 0; jj < TMTC_SUB_LENGTH ; jj++){  
             partialCRC = CM_Compute_CRC16(0, (UINT8*)tempData, (length-TMTC_CRC_LENGTH));  
         }  
     */  
     
79          partialCRC = CM_Compute_CRC16(partialCRC, (UINT8*)&subData, TMTC_SUB_LENGTH);          partialCRC = CM_Compute_CRC16(partialCRC, (UINT8*)&subData, TMTC_SUB_LENGTH);
80          partialCRC = CM_Compute_CRC16(partialCRC, (UINT8*)&CRCbuff, TMTC_SUBCRC_LENGTH);          partialCRC = CM_Compute_CRC16(partialCRC, (UINT8*)&CRCbuff, TMTC_SUBCRC_LENGTH);
81    
Legend:
Removed from v.2.4  
changed lines
  Added in v.2.5
  ViewVC Help
Powered by ViewVC 1.1.23