Loading SCOS.py +6 −5 Original line number Diff line number Diff line Loading @@ -105,7 +105,7 @@ class SCOS: # elif self.SPH.APID == 801 : # self.out = Decode801(hexdata[184:],self.Data.Service,self.Data.SubService) elif self.CPH.PType.Code ==2: self.TCPH=SCOS_TCPH(hexdata[120:208]) self.TCPH=SCOS_TCPH(data[120:208],self.CPH.SeqCounter) self.Data=data[208:] # c = BitArray(hex=hexdata[208:]) # self.SPH=SPHeader(c[:48]) Loading @@ -128,7 +128,7 @@ def jsQuery(name, value): #return s2kDB[name][value] class SCOS_TCPH: def __init__(self,data): def __init__(self,data,SSC): self.UplinkTime=Time(data[0:16]) self.ExecTime=Time(data[16:32]) self.LUTime=Time(data[32:48]) Loading @@ -137,12 +137,12 @@ class SCOS_TCPH: self.VarAddSz=BitArray(hex=data[60:64]).uint self.PUSAPID=BitArray(hex=data[64:68]).uint bTemp=BitArray(hex=data[64:68]) print("{} {}".format(int(bTemp.bin[5:12],2),int(bTemp.bin[12:16],2))) exit() self.PID=int(bTemp.bin[5:12],2) self.PCAT=int(bTemp.bin[12:16],2) self.PUSSSC=BitArray(hex=data[68:72]).uint self.PUSST=BitArray(hex=data[72:74]).uint self.PUSSST=BitArray(hex=data[74:76]).uint self.PUSAck=BitArray(hex=data[76:78]).uint self.PUSAck=BitArray(hex=data[76:78]).uint # # TODO: oggetto per la decodifica del binario solitamente 9 -> 0000 1001. ultimi 4 sono significativi primo (non) richieto ack per accettazione ultimo (non) richiesto ack per esecuzione self.UplinkFlag=BitArray(hex=data[78:80]).uint self.SourceHost=BitArray(hex=data[80:82]).uint self.SourceType=BitArray(hex=data[82:84]).uint Loading Loading @@ -242,6 +242,7 @@ class SCOS_CPH: self.SeqCounter=BitArray(hex=data[72:80]).uint self.SPID=BitArray(hex=data[80:88]).uint self.MissionID=MissionID(BitArray(hex=data[96:100]).uint) print("SPID: {} -- Sequence Counter: {}".format(self.SPID,self.SeqCounter)) class DataUnitType: def __init__(self,code): Loading Loading
SCOS.py +6 −5 Original line number Diff line number Diff line Loading @@ -105,7 +105,7 @@ class SCOS: # elif self.SPH.APID == 801 : # self.out = Decode801(hexdata[184:],self.Data.Service,self.Data.SubService) elif self.CPH.PType.Code ==2: self.TCPH=SCOS_TCPH(hexdata[120:208]) self.TCPH=SCOS_TCPH(data[120:208],self.CPH.SeqCounter) self.Data=data[208:] # c = BitArray(hex=hexdata[208:]) # self.SPH=SPHeader(c[:48]) Loading @@ -128,7 +128,7 @@ def jsQuery(name, value): #return s2kDB[name][value] class SCOS_TCPH: def __init__(self,data): def __init__(self,data,SSC): self.UplinkTime=Time(data[0:16]) self.ExecTime=Time(data[16:32]) self.LUTime=Time(data[32:48]) Loading @@ -137,12 +137,12 @@ class SCOS_TCPH: self.VarAddSz=BitArray(hex=data[60:64]).uint self.PUSAPID=BitArray(hex=data[64:68]).uint bTemp=BitArray(hex=data[64:68]) print("{} {}".format(int(bTemp.bin[5:12],2),int(bTemp.bin[12:16],2))) exit() self.PID=int(bTemp.bin[5:12],2) self.PCAT=int(bTemp.bin[12:16],2) self.PUSSSC=BitArray(hex=data[68:72]).uint self.PUSST=BitArray(hex=data[72:74]).uint self.PUSSST=BitArray(hex=data[74:76]).uint self.PUSAck=BitArray(hex=data[76:78]).uint self.PUSAck=BitArray(hex=data[76:78]).uint # # TODO: oggetto per la decodifica del binario solitamente 9 -> 0000 1001. ultimi 4 sono significativi primo (non) richieto ack per accettazione ultimo (non) richiesto ack per esecuzione self.UplinkFlag=BitArray(hex=data[78:80]).uint self.SourceHost=BitArray(hex=data[80:82]).uint self.SourceType=BitArray(hex=data[82:84]).uint Loading Loading @@ -242,6 +242,7 @@ class SCOS_CPH: self.SeqCounter=BitArray(hex=data[72:80]).uint self.SPID=BitArray(hex=data[80:88]).uint self.MissionID=MissionID(BitArray(hex=data[96:100]).uint) print("SPID: {} -- Sequence Counter: {}".format(self.SPID,self.SeqCounter)) class DataUnitType: def __init__(self,code): Loading