Update fc_block_decode.py

1 year ago · 62939ef070
parent 815ca7843b
commit 62939ef070
1 changed files with 6 additions and 6 deletions
--- a/groundstation/fc_block_decode.py
+++ b/groundstation/fc_block_decode.py
@ -34,11 +34,11 @@ frame_type = " "
 head_string = '<HEAD><meta http-equiv="refresh" content="5"></HEAD>\n<HTML>\n<H2>FunCube CubeSatSim Telemetry</H2>' + \
 		'<p><pre>  <img height="256" width="320" src="image_file.jpeg"><br>'
 foot_string = "</HTML>"
-telem_string = f"      Image: {image_id:3d} count: {image_count:2d}<p>" + \
+telem_string = f"           Image: {image_id:3d} count: {image_count:2d}<p>" + \
 		f" Vx(mV): {Vx:5d}   Vy(mV): {Vy:5d}   Vz(mV): {Vz:5d}<p>" + \
 		f" Ix(mA): {Ix:5d}   Iy(mA): {Iy:5d}   Iz(mA): {Iz:5d}<p>" + \
-  		f"     Vbat(mV): {Vb:5d}   Ibat(mA): {Ib:5d}<p></pre>" + \
-    		f" Seq: {sequence:d} {frame_type} frames: {frame_count:d}"
+  		f"     Vbat(mV): {Vb:5d}   Ibat(mA): {Ib:5d}<p>" + \
+    		f"           </pre>Seq: {sequence:d} {frame_type} frames: {frame_count:d}"
 with open("/home/pi/CubeSatSim/groundstation/public_html/index.html", "w") as html_file:
 	html_file.write(head_string)
 	html_file.write(telem_string)
@ -137,11 +137,11 @@ 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"      Image: {image_id:3d} count: {image_count:2d}<p>" + \
+								telem_string = f"           Image: {image_id:3d} count: {image_count:2d}<p>" + \
 										f" Vx(mV): {Vx:5d}   Vy(mV): {Vy:5d}   Vz(mV): {Vz:5d}<p>" + \
 										f" Ix(mA): {Ix:5d}   Iy(mA): {Iy:5d}   Iz(mA): {Iz:5d}<p>" + \
-  										f"     Vbat(mV): {Vb:5d}   Ibat(mA): {Ib:5d}<p></pre>" + \
-    										f" Seq: {sequence:d} {frame_type} frames: {frame_count:d}"
+									  	f"     Vbat(mV): {Vb:5d}   Ibat(mA): {Ib:5d}<p>" + \
+									    	f"           </pre>Seq: {sequence:d} {frame_type} frames: {frame_count:d}"
 								with open("/home/pi/CubeSatSim/groundstation/public_html/index.html", "w") as html_file:
 									html_file.write(head_string)
 									html_file.write(telem_string)