[GS] Implemented Bearing and Downrange in live screen.

Author: jbinz

ground_station/src/hmi/bmp.hpp

@@ -57,6 +57,31 @@ const unsigned char live_altitude[] PROGMEM = {
     0x00, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x30, 0x00,
     0x00, 0x30, 0x00, 0x01, 0xfe, 0x00, 0x01, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
+// 'down_range', 24x24px
+const unsigned char down_range[] PROGMEM = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xf0, 0x00, 0x1f, 0xe0,
+    0x00, 0x1f, 0x80, 0x00, 0x3f, 0x00, 0x00, 0x6e, 0x00, 0x00, 0xc0, 0x00, 0x01, 0x80, 0x00, 0x01, 0x80, 0x00,
+    0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x03, 0x00, 0x00, 0x03, 0x00, 0x00, 0x0f, 0xc0, 0x00, 0x0f, 0xc0, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+
+const unsigned char compass[] PROGMEM = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x03, 0xff, 0x80, 0x0e, 0x00, 0xe0,
+    0x1c, 0x00, 0x70, 0x18, 0x03, 0x30, 0x38, 0x0f, 0x38, 0x30, 0x1e, 0x18, 0x30, 0x3e, 0x18, 0x30, 0x6c, 0x18,
+    0x30, 0x6c, 0x18, 0x30, 0xf8, 0x18, 0x30, 0xf0, 0x18, 0x39, 0xe0, 0x38, 0x19, 0x80, 0x30, 0x0e, 0x00, 0xe0,
+    0x07, 0x83, 0xc0, 0x03, 0xff, 0x80, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+const unsigned char right_arrow[] PROGMEM = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x20, 0x00, 0x00, 0x30, 0x00, 0x00, 0x38, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x3f, 0x00,
+    0x00, 0x3f, 0x80, 0x00, 0x3f, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x30, 0x00,
+    0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+const unsigned char left_arrow[] PROGMEM = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x04, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x7c, 0x00, 0x00, 0xfc, 0x00,
+    0x01, 0xfc, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x0c, 0x00,
+    0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
 // 'battery', 24x24px
 const unsigned char live_battery[] PROGMEM = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x22, 0x00, 0x00, 0xff, 0x80,

ground_station/src/hmi/hmi.cpp

@@ -132,7 +132,7 @@ void Hmi::live() {
     if (link1Log) {
       recorder.record(&link1.data.getRxData(), 1);
     }
-    window.updateLive(&link1.data, &link1.info, 0);
+    window.updateLive(&link1.data, &navigation, &link1.info, 0);
     updated = true;
   } else if (link1.info.isUpdated()) {
     window.updateLive(&link1.info, 0);
@@ -145,7 +145,7 @@ void Hmi::live() {
     if (link2Log) {
       recorder.record(&link2.data.getRxData(), 2);
     }
-    window.updateLive(&link2.data, &link2.info, 1);
+    window.updateLive(&link2.data, &navigation, &link2.info, 1);
     updated = true;
   } else if (link2.info.isUpdated()) {
     window.updateLive(&link2.info, 1);
@@ -158,6 +158,14 @@ void Hmi::live() {
     window.refresh();
   }
 
+  if (rightButton.wasPressed()) {
+    window.UpdateLiveState(&link1.data, &link2.data, &navigation, Window::LiveState::kShowDownRange);
+  }
+
+  if (leftButton.wasPressed()) {
+    window.UpdateLiveState(&link1.data, &link2.data, &navigation, Window::LiveState::kShowGnss);
+  }
+
   if (backButton.wasPressed()) {
     state = MENU;
     isLogging = false;