From 62939ef070fd4e63875f7633c622733dfbb3cb6b Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sun, 9 Feb 2025 09:08:49 -0500 Subject: [PATCH] Update fc_block_decode.py --- groundstation/fc_block_decode.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/groundstation/fc_block_decode.py b/groundstation/fc_block_decode.py index da18d57d..6f47aa90 100644 --- a/groundstation/fc_block_decode.py +++ b/groundstation/fc_block_decode.py @@ -34,11 +34,11 @@ frame_type = " " head_string = '\n\n

FunCube CubeSatSim Telemetry

' + \ '

  
'
 foot_string = ""
-telem_string = f"      Image: {image_id:3d} count: {image_count:2d}
" + \
+telem_string = f"           Image: {image_id:3d} count: {image_count:2d}
" + \
 		f" Vx(mV): {Vx:5d}   Vy(mV): {Vy:5d}   Vz(mV): {Vz:5d}
" + \
 		f" Ix(mA): {Ix:5d}   Iy(mA): {Iy:5d}   Iz(mA): {Iz:5d}
" + \
-  		f"     Vbat(mV): {Vb:5d}   Ibat(mA): {Ib:5d}
" + \ - f" Seq: {sequence:d} {frame_type} frames: {frame_count:d}" + f" Vbat(mV): {Vb:5d} Ibat(mA): {Ib:5d}

" + \ + f" 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}

" + \ + telem_string = f" Image: {image_id:3d} count: {image_count:2d}

" + \ f" Vx(mV): {Vx:5d} Vy(mV): {Vy:5d} Vz(mV): {Vz:5d}

" + \ f" Ix(mA): {Ix:5d} Iy(mA): {Iy:5d} Iz(mA): {Iz:5d}

" + \ - f" Vbat(mV): {Vb:5d} Ibat(mA): {Ib:5d}

" + \ - f" Seq: {sequence:d} {frame_type} frames: {frame_count:d}" + f" Vbat(mV): {Vb:5d} Ibat(mA): {Ib:5d}

" + \ + f" 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)