diff --git a/awrams.py b/awrams.py index 0ec1b9d..403c567 100644 --- a/awrams.py +++ b/awrams.py @@ -48,10 +48,45 @@ class InfoFrame(object): MeasureRepeat: int= None def output_info_frame(self, ): + ret = "" + ret = ret + "time : " + self.time_stamp + ret = ret + NEWLINE + "time_stamp : " + self.time_stamp + ret = ret + NEWLINE + "year : " + self.year + ret = ret + NEWLINE + "month : " + self.month + ret = ret + NEWLINE + "day : " + self.day + ret = ret + NEWLINE + "hour : " + self.hour + ret = ret + NEWLINE + "minute : " + self.minute + ret = ret + NEWLINE + "second : " + self.second + + ret = ret + NEWLINE + "Roll : " + self.Roll + ret = ret + NEWLINE + "Pitch : " + self.Pitch + ret = ret + NEWLINE + "Yaw : " + self.Yaw + ret = ret + NEWLINE + "Hx : " + self.Hx + ret = ret + NEWLINE + "Hy : " + self.Hy + ret = ret + NEWLINE + "Hz : " + self.Hz + ret = ret + NEWLINE + "lon : " + self.lon + ret = ret + NEWLINE + "lat : " + self.lat + ret = ret + NEWLINE + "PDOP : " + self.PDOP + ret = ret + NEWLINE + "HDOP : " + self.HDOP + ret = ret + NEWLINE + "VDOP : " + self.VDOP + ret = ret + NEWLINE + "Temperature : " + self.Temperature + ret = ret + NEWLINE + "Humidity : " + self.Humidity + ret = ret + NEWLINE + "Battery : " + self.Battery + ret = ret + NEWLINE + "ErrorCode : " + self.ErrorCode + ret = ret + NEWLINE + "Azimuth : " + self.Azimuth + ret = ret + NEWLINE + "RunAngle : " + self.RunAngle + ret = ret + NEWLINE + "MeasureGroupNum : " + self.MeasureGroupNum + ret = ret + NEWLINE + "Tiltx : " + self.Tiltx + ret = ret + NEWLINE + "Tilty : " + self.Tilty + ret = ret + NEWLINE + "Depth : " + self.Depth + + ret = ret + NEWLINE + "SN1 : " + self.SN1 + ret = ret + NEWLINE + "SN2 : " + self.SN2 + ret = ret + NEWLINE + "SN3 : " + self.SN3 + ret = ret + NEWLINE + "MeasureInterval : " + self.MeasureInterval + ret = ret + NEWLINE + "MeasureRepeat : " + self.MeasureRepeat + return ret pass - - def get_year(self, ): - return self.year def set_info_frame(self, info:bytes): try: @@ -394,7 +429,7 @@ class AwramsHandle(object): for bf in bin_files: if bf.name != "info.bin": bytes_list.append( self.read_bin(bf) ) - # print(f"++++++++++ {bytes_list}" ) + self.aw.data.set_data_frame( bytes_list, pth, self.aw.callback ) # 目录也要传过去 pass