--- yoda/techmodel/TmtcReader.cpp 2004/12/17 18:02:37 2.4 +++ yoda/techmodel/TmtcReader.cpp 2004/12/20 14:15:13 2.5 @@ -1,6 +1,6 @@ /** @file * $Source: /home/cvsmanager/yoda/techmodel/TmtcReader.cpp,v $ - * $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 $ * $Author: kusanagi $ * * Implementation of the TmtcReader class. @@ -40,7 +40,7 @@ */ std::string TmtcReader::GetVersionInfo(void) const { return - "$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"; } /** @@ -57,17 +57,6 @@ */ void TmtcReader::RunEvent(int EventNumber, long int length) throw (WrongCRCException){ -/* -//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 -*/ - int i, j; char subData[TMTC_SUB_LENGTH]; char CRCbuff[TMTC_SUBCRC_LENGTH]; @@ -82,21 +71,11 @@ UINT16 partialCRC = 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) -/* char tempData[length-TMTC_CRC_LENGTH]; - InputFile->read(tempData, sizeof(tempData)); - partialCRC = CM_Compute_CRC16(0, (UINT8*)tempData, (length-TMTC_CRC_LENGTH)); -*/ - for(i = 0; i < numRecords; i++) { start = InputFile->tellg(); InputFile->read(subData, sizeof(subData)); InputFile->read(CRCbuff, sizeof(CRCbuff)); - /* for (int jj = 0; jj < TMTC_SUB_LENGTH ; jj++){ - partialCRC = CM_Compute_CRC16(0, (UINT8*)tempData, (length-TMTC_CRC_LENGTH)); - } - */ - partialCRC = CM_Compute_CRC16(partialCRC, (UINT8*)&subData, TMTC_SUB_LENGTH); partialCRC = CM_Compute_CRC16(partialCRC, (UINT8*)&CRCbuff, TMTC_SUBCRC_LENGTH);