add more flight data to UI

Author: RobertJN64

UI/include/flight_data.h

@@ -52,6 +52,12 @@ struct flight_history_t {
   float target_pos_west;
   float target_pos_up;
 
+  float elapsed_time;
+  bool GND_flag;
+  bool flight_armed;
+  float thrust_perc;
+  float diffy_perc;
+
   // points to the oldest stored data
   int read_start_pos;
   // points to the most recently written data
@@ -97,6 +103,12 @@ struct flight_packet_t {
   float target_pos_north;
   float target_pos_west;
   float target_pos_up;
+
+  float elapsed_time;
+  bool GND_flag;
+  bool flight_armed;
+  float thrust_perc;
+  float diffy_perc;
 };
 
 extern flight_history_t FlightHistory; // public interface

UI/include/ui_components.h

@@ -8,5 +8,6 @@ extern ImFont *large_font;
 
 void centered_text(const char *text);
 bool rounded_button(const char *label, const ImVec2 &size, ImU32 color, float rounding = 10.0f);
+void colored_flag(char *text, bool state, ImVec4 on_color, ImVec4 off_color, char *imgui_id);
 
 #endif

UI/src/flight_data.cpp

@@ -71,6 +71,12 @@ void commit_packet() {
   FlightHistory.target_pos_west = active_packet.target_pos_west;
   FlightHistory.target_pos_up = active_packet.target_pos_up;
 
+  FlightHistory.elapsed_time = active_packet.elapsed_time;
+  FlightHistory.GND_flag = active_packet.GND_flag;
+  FlightHistory.flight_armed = active_packet.flight_armed;
+  FlightHistory.thrust_perc = active_packet.thrust_perc;
+  FlightHistory.diffy_perc = active_packet.diffy_perc;
+
   FlightHistory.write_pos += 1;
   FlightHistory.write_pos %= FLIGHT_HISTORY_LENGTH;
   FlightHistory.read_start_pos = FlightHistory.write_pos;

UI/src/ui.cpp

@@ -177,8 +177,19 @@ void controller_output_panel() {
   centered_text("Controller Output");
   ImGui::Text("  Target Thrust: %5.2f N", FlightHistory.thrust_N);
   ImGui::Text("    Target Roll: %5.2f rad/s^2", FlightHistory.roll_roll_rad_sec_squared);
-  ImGui::Text("         Thrust: %5.2f %%", 0); // TODO - these
-  ImGui::Text("   Differential: %5.2f %%", 0);
+  ImGui::Text("         Thrust: %5.2f %%", FlightHistory.thrust_perc);
+  ImGui::Text("   Differential: %5.2f %%", FlightHistory.diffy_perc);
+
+  ImGui::Dummy(ImVec2(0, 100));
+
+  ImGui::Text("Elasped Time: %5.2f s", FlightHistory.elapsed_time);
+  colored_flag("    GND Flag", FlightHistory.GND_flag, ImVec4(0.0f, 153.0 / 255.0, 0.0f, 1.0f), ImVec4(204.0 / 255.0, 0.0f, 0.0f, 1.0f), "##gnd_flag");
+  ImGui::TableSetColumnIndex(1);
+  if (FlightHistory.flight_armed) {
+    colored_flag("       Armed", FlightHistory.flight_armed, ImVec4(204.0 / 255.0, 0.0f, 0.0f, 1.0f), ImVec4(0.0f, 153.0 / 255.0, 0.0f, 1.0f), "##armed_flag");
+  } else {
+    colored_flag("     Not Armed", FlightHistory.flight_armed, ImVec4(204.0 / 255.0, 0.0f, 0.0f, 1.0f), ImVec4(0.0f, 153.0 / 255.0, 0.0f, 1.0f), "##armed_flag");
+  }
 
   ImGui::End();
 }

UI/src/ui_components.cpp

@@ -38,4 +38,24 @@ bool rounded_button(const char *label, const ImVec2 &size, ImU32 color, float ro
   ImGui::PopStyleColor(3);
 
   return clicked;
+}
+
+void colored_flag(char *text, bool state, ImVec4 on_color, ImVec4 off_color, char *imgui_id) {
+  ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 8.0f);
+  if (state) {
+    ImGui::PushStyleColor(ImGuiCol_FrameBg, on_color);
+    ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, on_color);
+    ImGui::PushStyleColor(ImGuiCol_FrameBgActive, on_color);
+  } else {
+    ImGui::PushStyleColor(ImGuiCol_FrameBg, off_color);
+    ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, off_color);
+    ImGui::PushStyleColor(ImGuiCol_FrameBgActive, off_color);
+  }
+
+  ImGui::SetNextItemWidth(200.0f); // pixels
+  ImGui::BeginDisabled();          // prevent editing
+  ImGui::InputText(imgui_id, text, ImGuiInputTextFlags_ReadOnly);
+  ImGui::EndDisabled();
+  ImGui::PopStyleColor(3);
+  ImGui::PopStyleVar();
 }