Monitor time, fuel directly

analysis.rmd

@@ -16,12 +16,14 @@ flight <- read.csv("flight.csv", header=T)
 ```
 
 ```{r graph}
-baseg <- ggplot(flight, aes(x=timepoint / 10)) + xlab("Time (seconds)") + theme_classic()
+baseg <- ggplot(flight, aes(x=mission_time)) + xlab("Time (seconds)") + theme_classic()
 alt <- baseg + geom_line(aes(y=current_altitude)) + ylab("Altitude (m)") + ggtitle("Altitude")
 vspd <- baseg + geom_line(aes(y=v_speed)) + ylab("Vertical speed (m/s)") + ggtitle("Vertical speed")
 hspd <- baseg + geom_line(aes(y=h_speed)) + ylab("Horizontal speed (m/s)") + ggtitle("Horizontal speed")
 mass <- baseg + geom_line(aes(y=mass)) + ylab("Vessel mass (kg)") + ggtitle("Mass")
-fuel <- baseg + geom_line(aes(y=fuel)) + ylab("Fuel (kg)") + ggtitle("Fuel")
+ec <- baseg + geom_line(aes(y=electric_charge)) + ylab("Electric charge") + ggtitle("Electric charge")
+lf <- baseg + geom_line(aes(y=liquid_fuel)) + ylab("Liquid fuel (litres)") + ggtitle("Liquid fuel")
+ox <- baseg + geom_line(aes(y=oxidizer)) + ylab("Oxidizer (litres)") + ggtitle("Oxidizer")
 at <- baseg + geom_line(aes(y=available_thrust)) + ylab("Available thrust (Newtons)") + ggtitle("Available thrust")
 thrust <- baseg + geom_line(aes(y=current_thrust)) + ylab("Current thrust (Newtons)") + ggtitle("Current thrust")
 g_force <- baseg + geom_line(aes(y=g_force)) + ylab("G-force (m/s²)") + ggtitle("G-force")
@@ -32,7 +34,9 @@ alt
 vspd
 hspd
 mass
-fuel
+ec
+lf
+ox
 at
 thrust
 g_force

monitor.py

@@ -42,8 +42,7 @@ button.rect_transform.position = (0, 0)
 button_clicked = conn.add_stream(getattr, button, 'clicked')
 
 f = open(datafile, 'w')
-f.write('timepoint, current_altitude, v_speed, h_speed, mass, fuel, available_thrust, current_thrust, g_force\n')
-timepoint = 0
+f.write('mission_time, current_altitude, v_speed, h_speed, mass, electric_charge, liquid_fuel, oxidizer, available_thrust, current_thrust, g_force\n')
 
 vessel = conn.space_center.active_vessel
 body = vessel.orbit.body
@@ -57,14 +56,12 @@ while button_clicked() == False:
     v_speed = vessel.flight(r_frame).vertical_speed
     h_speed = vessel.flight(r_frame).horizontal_speed
     c_thrust = vessel.thrust
+    e_charge = vessel.resources.amount('ElectricCharge')
+    lf = vessel.resources.amount('LiquidFuel')
+    ox = vessel.resources.amount('Oxidizer')
     g_force = vessel.flight(r_frame).g_force
-    f.write('{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}\n'.format(timepoint,
-                                                              current_altitude,
-                                                              v_speed, h_speed,
-                                                              vm, vm -
-                                                              dry_mass, at,
-                                                              c_thrust, g_force))
-    timepoint = timepoint + 1
+    timept = vessel.met
+    f.write('{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9}, {10}\n'.format(timept, current_altitude, v_speed, h_speed, vm, e_charge, lf, ox, at, c_thrust, g_force))
     time.sleep(0.1)
 
 f.close()