diff --git a/groundstation/fc_block_decode.py b/groundstation/fc_block_decode.py index c02a0fba..8a7197ea 100644 --- a/groundstation/fc_block_decode.py +++ b/groundstation/fc_block_decode.py @@ -22,13 +22,15 @@ image_count = 0 Vx = 0 Vy = 0 Vz = 0 +Vb = 0 Ix = 0 Iy = 0 Iz = 0 +Ib = 0 head_string = '\n\n

FunCube 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

Ix: {Ix:5d} mA Iy: {Iy:5d} mA Iz: {Iz:5d} mA" +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

Vb: {Vb:5d} mV Ib: {Ib: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) @@ -122,7 +124,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

Ix: {Ix:5d} mA Iy: {Iy:5d} mA Iz: {Iz:5d} mA" + 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

Vb: {Vb:5d} mV Ib: {Ib: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)