--- yoda/techmodel/TmtcReader.cpp 2004/12/17 12:46:20 2.3 +++ yoda/techmodel/TmtcReader.cpp 2004/12/17 18:02:37 2.4 @@ -1,6 +1,6 @@ /** @file * $Source: /home/cvsmanager/yoda/techmodel/TmtcReader.cpp,v $ - * $Id: TmtcReader.cpp,v 2.2 2004/12/09 08:48:41 kusanagi Exp $ + * $Id: TmtcReader.cpp,v 2.3 2004/12/17 12:46:20 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.2 2004/12/09 08:48:41 kusanagi Exp $\n"; + "$Header: /home/cvsmanager/yoda/techmodel/TmtcReader.cpp,v 2.3 2004/12/17 12:46:20 kusanagi Exp $\n"; } /** @@ -103,14 +103,14 @@ //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->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; + 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); for(j = 0; j < 12; j++) { rec->TM_TH_ANA[j] = ((((UINT16)subData[6+j]<<8)&0xFF00) + (((UINT16)subData[7+j])&0x00FF)); //20 is the size of TM_DEA_ANA(16) + OBT(4) } for(j = 0; j < 6; j++) { - rec->TM_DEA_ANA[j] = subData[8+j]; + rec->TM_DEA_ANA[j] = subData[30+j]; } } else {