--- yoda/techmodel/TmtcReader.cpp 2005/05/23 13:53:43 4.4 +++ yoda/techmodel/TmtcReader.cpp 2006/03/21 21:49:07 6.1 @@ -1,6 +1,6 @@ /** @file * $Source: /home/cvsmanager/yoda/techmodel/TmtcReader.cpp,v $ - * $Id: TmtcReader.cpp,v 4.3 2005/05/23 11:53:48 kusanagi Exp $ + * $Id: TmtcReader.cpp,v 6.0 2006/02/07 17:11:10 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 4.3 2005/05/23 11:53:48 kusanagi Exp $\n"; + "$Header: /home/cvsmanager/yoda/techmodel/TmtcReader.cpp,v 6.0 2006/02/07 17:11:10 kusanagi Exp $\n"; } /** @@ -57,7 +57,11 @@ */ void TmtcReader::RunEvent(int EventNumber, long int length) throw (WrongCRCException){ - int i, j; + int i, j, k; + /* The ' k ' indexs the number of recs. + * It is needed to be indipendent from ' i ' because in case of CRC error the single record is skipped and ' i ' increase by one, but correct records to be stored are still ' i '. + */ + k = 0; char subData[TMTC_SUB_LENGTH]; char CRCbuff[TMTC_SUBCRC_LENGTH]; char eventCRC[TMTC_CRC_LENGTH]; @@ -80,7 +84,7 @@ //This == CRCBuff is not really parametric take care if have to change the static lengths if((UINT8)(CM_Compute_CRC16(0, (UINT8*)&subData, TMTC_SUB_LENGTH)) == (UINT8)CRCbuff[0]){ - rec = new(recs[i]) TmtcRecord(); //add a new TmtcRecord + rec = new(recs[k++]) TmtcRecord(); //add a new TmtcRecord rec->TM_RECORD_OBT = (((UINT32)subData[0]<<24)&0xFF000000) + (((UINT32)subData[1]<<16)&0x00FF0000) + (((UINT32)subData[2]<<8)&0x0000FF00) + (((UINT32)subData[3])&0x000000FF); rec->TM_DIAG_AND_BILEVEL_ACQ = (((UINT16)subData[4]<<8)&0x0000FF00) + (((UINT16)subData[5])&0x000000FF);