Update fc_block_decode.py fix seq number

1 year ago · 39f8910f5a
parent 211e7f4b1a
commit 39f8910f5a
1 changed files with 14 additions and 3 deletions
--- a/groundstation/fc_block_decode.py
+++ b/groundstation/fc_block_decode.py
@ -16,9 +16,20 @@ FC_SW = 50
 FC_PAYLOAD = 55
 extended = 1

+sequence = 0
+image_id = 0
+image_count = 0
+Vx = 0
+Vy = 0
+Vz = 0
+
 head_string = '<HEAD><meta http-equiv="refresh" content="5"></HEAD>\n<HTML>\nFunCube CubeSatSim Telemetry\n<p>\n<img height="256" width="320" src="image_file.jpeg"><p>'
 foot_string = "</p>\n</HTML>"
-
+telem_string = f"\nSequence number: {sequence:5d} Image ID: {image_id:3d} count: {image_count:2d}<p>Vx: {Vx:5d} mV Vy: {Vy:5d} mV Vz: {Vz:5d} mV"
+with open("/home/pi/CubeSatSim/groundstation/public_html/index.html", "w") as html_file:
+	html_file.write(head_string)
+	html_file.write(telem_string)
+	html_file.write(foot_string)

 image_id = 256 		# set illegal image ID for null # random.randint(0, 255)
 image_count = 0;
@ -51,7 +62,7 @@ if __name__ == "__main__":
 				if (data_block[0] == 0xE1):
 					print("CubeSatSim Frametype RT2+IMG2")	
 				print(data_block[extended + 51], data_block[extended + 50], data_block[extended + 49])
-				sequence = data_block[extended + 51] + data_block[extended + 50] * 2**16 + data_block[extended + 49] * 2**32	
+				sequence = data_block[extended + 51] + data_block[extended + 50] * 2**8 + data_block[extended + 49] * 2**16	
 				print("Sequence number: {:d}".format(sequence))
 				Vx = (data_block[extended + FC_EPS + 0] * 2**6) + (data_block[extended + FC_EPS + 1] >> 2)
 				Vy = (0x03 & data_block[extended + FC_EPS + 1]) * 2**12 + data_block[extended + FC_EPS + 2] * 2**4 + (data_block[extended + FC_EPS + 3] >> 4)
@ -104,7 +115,7 @@ if __name__ == "__main__":
 								system("/home/pi/ssdv/ssdv -d -J /home/pi/fctelem/image_file " + filename)	
 								system("cp " + filename + " /home/pi/CubeSatSim/groundstation/public_html/image_file.jpeg")
 #								telem_string = "\nSequence number: " + str(sequence) + "\nImage ID: " + str(image_id) + " count: " + str(image_count)
-								telem_string = f"\nSequence number: {sequence:5d} Image ID: {image_id:3d} count: {image_count:2d}<p>Vx: {Vx:5d} mV Vy: {Vy:5d} mV Vz: {Vz:5d} mV"
+#								telem_string = f"\nSequence number: {sequence:5d} Image ID: {image_id:3d} count: {image_count:2d}<p>Vx: {Vx:5d} mV Vy: {Vy:5d} mV Vz: {Vz:5d} mV"
 								with open("/home/pi/CubeSatSim/groundstation/public_html/index.html", "w") as html_file:
 									html_file.write(head_string)
 									html_file.write(telem_string)