From 798a0982a014a1205502ae3b54a03a6ee26c5c38 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sat, 8 Feb 2025 16:44:33 -0500 Subject: [PATCH] Update fc_block_decode.py add I --- groundstation/fc_block_decode.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/groundstation/fc_block_decode.py b/groundstation/fc_block_decode.py index 681ea5d0..089e255f 100644 --- a/groundstation/fc_block_decode.py +++ b/groundstation/fc_block_decode.py @@ -22,10 +22,13 @@ image_count = 0 Vx = 0 Vy = 0 Vz = 0 +Ix = 0 +Iy = 0 +Iz = 0 -head_string = '\n\nFunCube CubeSatSim Telemetry\n

\n

'
+head_string = '\n\nFunCube CubeSatSim Telemetry\n
\n
  
'
 foot_string = "
\n"
-telem_string = f"\nSequence number: {sequence:5d} Image ID: {image_id:3d} count: {image_count:2d}
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}
Vx: {Vx:5d} mV  Vy: {Vy:5d} mV  Vz: {Vz:5d} mV
Ix: {Ix:5d} mA  Iy: {Iy:5d} mA  Iz: {Iz:5d} mA"
 with open("/home/pi/CubeSatSim/groundstation/public_html/index.html", "w") as html_file:
 	html_file.write(head_string)
 	html_file.write(telem_string)
@@ -67,6 +70,11 @@ if __name__ == "__main__":
 				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)
 				Vz = (0x0f & data_block[extended + FC_EPS + 3]) * 2**10 + data_block[extended + FC_EPS + 4] * 2**2 + (data_block[extended + FC_EPS + 5] >> 6)
+				Vb = (0x3f & data_block[extended + FC_EPS + 5]) * 2**8 + data_block[extended + FC_EPS + 6]
+				Ix = data_block[extended + FC_EPS + 7] * 2**2 + data_block[extended + FC_EPS + 8] >> 6
+				Iy = (0x3f & data_block[extended + FC_EPS + 8]) * 2**4 + data_block[extended + FC_EPS + 9] >> 4
+				Iz = (0x0f & data_block[extended + FC_EPS + 9]) * 2**6 + data_block[extended + FC_EPS + 10] >> 2
+				
 				print("Vx: {:d} mV Vy: {:d} mV Vz: {:d} mV".format(Vx, Vy, Vz))
 				print('Payload {:x} {:x} \n'.format(data_block[FC_PAYLOAD + extended], data_block[FC_PAYLOAD + extended + 1]))
 				if (data_block[FC_PAYLOAD + extended] == 0x55) and (data_block[FC_PAYLOAD + extended + 1] == 0x68):
@@ -114,7 +122,7 @@ if __name__ == "__main__":
 								filename = "/home/pi/fctelem/image_file" + str(image_id) + "." + str(image_count) + ".jpeg"	
 								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 = f"\nSequence number: {sequence:5d} Image ID: {image_id:3d} count: {image_count:2d}
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}
Vx: {Vx:5d} mV  Vy: {Vy:5d} mV  Vz: {Vz:5d} mV
Ix: {Ix:5d} mA  Iy: {Iy:5d} mA  Iz: {Iz:5d} mA"
 								with open("/home/pi/CubeSatSim/groundstation/public_html/index.html", "w") as html_file:
 									html_file.write(head_string)
 									html_file.write(telem_string)