Implementation

Author: druckgott

docs/OSD.md

@@ -197,7 +197,6 @@ Here are the OSD Elements provided by INAV.
 | 163 | OSD_COURSE_TO_FENCE                              | 8.0.0  |       |
 | 164 | OSD_H_DIST_TO_FENCE                              | 8.0.0  |       |
 | 165 | OSD_V_DIST_TO_FENCE                              | 8.0.0  |       |
-| 166 | OSD_FLIGHT_DIR                                   | 9.0.0  |       |
 
 # Pilot Logos
 

src/main/cms/cms_menu_osd.c

@@ -204,7 +204,6 @@ static const OSD_Entry menuOsdElemsEntries[] =
     OSD_ELEMENT_ENTRY("BATT % REM", OSD_BATTERY_REMAINING_PERCENT),
 #ifdef USE_GPS
     OSD_ELEMENT_ENTRY("HOME DIR", OSD_HOME_DIR),
-    OSD_ELEMENT_ENTRY("FLIGHT_DIR", OSD_FLIGHT_DIR),
     OSD_ELEMENT_ENTRY("HOME HEAD. ERR", OSD_HOME_HEADING_ERROR),
     OSD_ELEMENT_ENTRY("HOME DIST", OSD_HOME_DIST),
     OSD_ELEMENT_ENTRY("TRIP DIST", OSD_TRIP_DIST),
@@ -421,6 +420,7 @@ static const OSD_Entry menuOsdHud2Entries[] = {
 
     OSD_SETTING_ENTRY("HOMING ARROWS", SETTING_OSD_HUD_HOMING),
     OSD_SETTING_ENTRY("HOME POINT", SETTING_OSD_HUD_HOMEPOINT),
+    OSD_SETTING_ENTRY("FLIGHT DIRECTION", SETTING_OSD_HUD_FLIGHT_DIRECTION),
     OSD_SETTING_ENTRY("RADAR MAX AIRCRAFT", SETTING_OSD_HUD_RADAR_DISP),
     OSD_SETTING_ENTRY("RADAR MIN RANGE", SETTING_OSD_HUD_RADAR_RANGE_MIN),
     OSD_SETTING_ENTRY("RADAR MAX RANGE", SETTING_OSD_HUD_RADAR_RANGE_MAX),

src/main/fc/settings.yaml

@@ -3512,6 +3512,11 @@ groups:
         default_value: OFF
         field: hud_homepoint
         type: bool
+      - name: osd_hud_flight_direction
+        description: "To 3D-display the moving destination direction in the hud"
+        default_value: OFF
+        field: hud_flight_direction
+        type: bool
       - name: osd_hud_radar_disp
         description: "Maximum count of nearby aircrafts or points of interest to display in the hud, as sent from an ESP32 LoRa module. Set to 0 to disable (show nothing). The nearby aircrafts will appear as markers A, B, C, etc"
         default_value: 0

src/main/io/osd.c

@@ -1957,18 +1957,6 @@ static bool osdDrawSingleElement(uint8_t item)
             }
             return true;
         }
-
-    case OSD_FLIGHT_DIR:
-        {
-            int16_t vx = getEstimatedActualVelocity(X);  // in cm/s
-            int16_t vy = getEstimatedActualVelocity(Y);  // in cm/s
-            int16_t vz = getEstimatedActualVelocity(Z);  // in cm/s
-            float direction_deg = RADIANS_TO_DEGREES(atan2f((float)vy, (float)vx));
-            int16_t altitude_relative = (vz / 100);  // in m
-            //osdHudDrawPoi(0, (int16_t)direction_deg, altitude_relative, 0, SYM_ALERT, 0, 0);
-            osdHudDrawDirection((int16_t)direction_deg, altitude_relative, SYM_ALERT);
-            return true;
-        }
 
     case OSD_HOME_HEADING_ERROR:
         {
@@ -2782,12 +2770,10 @@ static bool osdDrawSingleElement(uint8_t item)
                 int vx = getEstimatedActualVelocity(X);  // in cm/s
                 int vy = getEstimatedActualVelocity(Y);  // in cm/s
                 int vz = getEstimatedActualVelocity(Z);  // in cm/s
-            
-                // Nur Richtung anzeigen, keine Vorausschau mehr
+
                 float direction_deg = RADIANS_TO_DEGREES(atan2f((float)vy, (float)vx));
                 int altitude_relative = (vz / 100);
-            
-                // Flugrichtung nur darstellen, wenn relevante Bewegung vorhanden ist
+
                 //osdHudDrawPoi(0, (int16_t)direction_deg, altitude_relative, 0, SYM_ALERT, 0, 0);
                 osdHudDrawDirection((int16_t)direction_deg, altitude_relative, SYM_ALERT);
 
@@ -4281,7 +4267,6 @@ void pgResetFn_osdLayoutsConfig(osdLayoutsConfig_t *osdLayoutsConfig)
     // OSD_VARIO_NUM at the right of OSD_VARIO
     osdLayoutsConfig->item_pos[0][OSD_VARIO_NUM] = OSD_POS(24, 7);
     osdLayoutsConfig->item_pos[0][OSD_HOME_DIR] = OSD_POS(14, 11);
-    osdLayoutsConfig->item_pos[0][OSD_FLIGHT_DIR] = OSD_POS(14, 12);
     osdLayoutsConfig->item_pos[0][OSD_ARTIFICIAL_HORIZON] = OSD_POS(8, 6);
     osdLayoutsConfig->item_pos[0][OSD_HORIZON_SIDEBARS] = OSD_POS(8, 6);
 

src/main/io/osd.h

@@ -169,7 +169,6 @@ typedef enum {
     OSD_GPS_LON,
     OSD_GPS_LAT,
     OSD_HOME_DIR,
-    OSD_FLIGHT_DIR,
     OSD_HOME_DIST,
     OSD_HEADING,
     OSD_VARIO,

src/main/io/osd_dji_hd.c

@@ -190,7 +190,6 @@ const djiOsdMapping_t djiOSDItemIndexMap[] = {
     { -1,                                     0 }, // DJI: OSD_MAIN_BATT_USAGE
     { -1,                                     0 }, // DJI: OSD_DISARMED
     { OSD_HOME_DIR,                           FEATURE_GPS }, // DJI: OSD_HOME_DIR
-    { OSD_FLIGHT_DIR,                         FEATURE_GPS }, // DJI: OSD_FLIGHT_DIR
     { OSD_HOME_DIST,                          FEATURE_GPS }, // DJI: OSD_HOME_DIST
     { OSD_HEADING,                            0 }, // DJI: OSD_NUMERICAL_HEADING
     { OSD_VARIO_NUM,                          0 }, // DJI: OSD_NUMERICAL_VARIO

src/main/io/osd_hud.h

@@ -26,7 +26,6 @@ typedef struct displayCanvas_s displayCanvas_t;
 void osdHudClear(void);
 void osdHudDrawCrosshair(displayCanvas_t *canvas, uint8_t px, uint8_t py);
 void osdHudDrawHoming(uint8_t px, uint8_t py);
-void osdHudDrawDirection(int16_t poiDirection, int32_t poiAltitude, uint16_t poiSymbol);
 void osdHudDrawPoi(uint32_t poiDistance, int16_t poiDirection, int32_t poiAltitude, uint8_t poiType, uint16_t poiSymbol, int16_t poiP1, int16_t poiP2);
 void osdHudDrawDirection(int16_t poiDirection, int32_t poiAltitude, uint16_t poiSymbol);
 int8_t radarGetNearestPOI(void);