Ver Fonte

Added further symbols

Nicole Portas há 1 ano atrás
pai
commit
7f68fe13d5

+ 15 - 4
patch/inav/src/main/io/bf_osd_symbols.h

@@ -28,18 +28,20 @@
 #define BF_SYM_HYPHEN                  0x2D
 #define BF_SYM_BBLOG                   0x10
 #define BF_SYM_HOMEFLAG                0x11
-#define BF_SYM_HOMENEAR                0x7E
+#define BF_SYM_HOMENEAR                0x05
 #define BF_SYM_RPM                     0x12
 #define BF_SYM_ROLL                    0x14
 #define BF_SYM_PITCH                   0x15
 #define BF_SYM_TEMPERATURE             0x7A
-#define BF_SYM_CLOCK                   0x40
+#define BF_SYM_MAX                     0x24
+#define BF_SYM_GLIDESLOPE              0x0B
+#define BF_SYM_WAYPOINT                0x7E
 
 // GPS and navigation
 #define BF_SYM_LAT                     0x89
 #define BF_SYM_LON                     0x98
 #define BF_SYM_ALTITUDE                0x7F
-#define BF_SYM_TOTAL_DISTANCE          0x71
+#define BF_SYM_TOTAL_DISTANCE          0x12
 #define BF_SYM_OVER_HOME               0x05
 
 // RSSI
@@ -68,6 +70,7 @@
 #define BF_SYM_HEADING_W               0x1B
 #define BF_SYM_HEADING_DIVIDED_LINE    0x1C
 #define BF_SYM_HEADING_LINE            0x1D
+#define BF_SYM_HEADING                 0x08
 
 // AH Center screen Graphics
 #define BF_SYM_AH_CENTER_LINE          0x72
@@ -101,6 +104,12 @@
 
 #define BF_SYM_ARROW_SMALL_UP          0x75
 #define BF_SYM_ARROW_SMALL_DOWN        0x76
+#define BF_SYM_VARIO_UP_2A             0x68
+#define BF_SYM_VARIO_UP_1A             0x75
+#define BF_SYM_VARIO_DOWN_1A           0x76
+#define BF_SYM_VARIO_DOWN_2A           0x60
+
+
 
 // AH Bars
 #define BF_SYM_AH_BAR9_0               0x80
@@ -142,9 +151,11 @@
 // Time
 #define BF_SYM_ON_M                    0x9B
 #define BF_SYM_FLY_M                   0x9C
+#define BF_SYM_CLOCK                   0x40
+#define BF_SYM_ON_H                    0x70
+#define BF_SYM_FLY_H                   0x71
 
 // Speed
-#define BF_SYM_SPEED                   0x70
 #define BF_SYM_KPH                     0x9E
 #define BF_SYM_MPH                     0x9D
 #define BF_SYM_MPS                     0x9F

+ 36 - 45
patch/inav/src/main/io/displayport_msp_bf_compat.c

@@ -62,10 +62,10 @@ uint8_t getBfCharacter(uint8_t ch, uint8_t page)
     case SYM_DEGREES:
         return BF_SYM_GPS_DEGREE;
 
-/*
+
     case SYM_HEADING:
         return BF_SYM_HEADING;
-
+/*
     case SYM_SCALE:
         return BF_SYM_SCALE;
 
@@ -177,19 +177,19 @@ uint8_t getBfCharacter(uint8_t ch, uint8_t page)
 
     case SYM_AMP:
         return BF_SYM_AMP;
-/*
+
     case SYM_WH:
-        return BF_SYM_WH;
+        return BF_SYM_WATT;
 
     case SYM_WH_KM:
-        return BF_SYM_WH_KM;
+        return BF_SYM_WATT;
 
     case SYM_WH_MI:
-        return BF_SYM_WH_MI;
+        return BF_SYM_WATT;
 
     case SYM_WH_NM:
-        return BF_SYM_WH_NM;
-*/
+        return BF_SYM_WATT;
+
     case SYM_WATT:
         return BF_SYM_WATT;
 /*
@@ -229,9 +229,6 @@ uint8_t getBfCharacter(uint8_t ch, uint8_t page)
     case SYM_DIST_MI:
         return BF_SYM_MILES;
 
-    case SYM_DIST_NM:
-        return BF_SYM_NM;
-
     case SYM_M:
         return BF_SYM_M;
 
@@ -240,10 +237,10 @@ uint8_t getBfCharacter(uint8_t ch, uint8_t page)
 
     case SYM_MI:
         return BF_SYM_MILES;
-/*
+
     case SYM_NM:
         return BF_SYM_NM;
-*/
+
     case SYM_WIND_HORIZONTAL:
         return 'W';     // W for wind
 
@@ -280,10 +277,10 @@ uint8_t getBfCharacter(uint8_t ch, uint8_t page)
 
     case SYM_MPH:
         return BF_SYM_MPH;
-/*
-    case SYM_KT:
-        return BF_SYM_KT
 
+    case SYM_KT:
+        return BF_SYM_MPH
+/*
     case SYM_MAH_MI_0:
         return BF_SYM_MAH_MI_0;
 
@@ -301,25 +298,25 @@ uint8_t getBfCharacter(uint8_t ch, uint8_t page)
 
     case SYM_BLANK:
         return BF_SYM_BLANK;
-/*
+
     case SYM_ON_H:
         return BF_SYM_ON_H;
 
     case SYM_FLY_H:
         return BF_SYM_FLY_H;
-*/
+
     case SYM_ON_M:
         return BF_SYM_ON_M;
 
     case SYM_FLY_M:
         return BF_SYM_FLY_M;
-/*
+
     case SYM_GLIDESLOPE:
         return BF_SYM_GLIDESLOPE;
 
     case SYM_WAYPOINT:
         return BF_SYM_WAYPOINT;
-*/
+
     case SYM_CLOCK:
         return BF_SYM_CLOCK;
 /*
@@ -364,28 +361,28 @@ uint8_t getBfCharacter(uint8_t ch, uint8_t page)
 
     case SYM_GFORCE_Z:
         return BF_SYM_GFORCE_Z;
-
+*/
     case SYM_BARO_TEMP:
-        return BF_SYM_BARO_TEMP;
+        return BF_SYM_TEMPERATURE;
 
     case SYM_IMU_TEMP:
-        return BF_SYM_IMU_TEMP;
+        return BF_SYM_TEMPERATURE;
 
     case SYM_TEMP:
-        return BF_SYM_TEMP;
+        return BF_SYM_TEMPERATURE;
 
     case SYM_TEMP_SENSOR_FIRST:
-        return BF_SYM_TEMP_SENSOR_FIRST;
+        return BF_SYM_TEMPERATURE;
 
     case SYM_ESC_TEMP:
-        return BF_SYM_ESC_TEMP;
+        return BF_SYM_TEMPERATURE;
 
     case SYM_TEMP_SENSOR_LAST:
-        return BF_SYM_TEMP_SENSOR_LAST;
+        return BF_SYM_TEMPERATURE;
 
     case TEMP_SENSOR_SYM_COUNT:
-        return BF_TEMP_SENSOR_SYM_COUNT;
-*/
+        return BF_SYM_TEMPERATURE;
+
     case SYM_HEADING_N:
         return BF_SYM_HEADING_N;
 
@@ -403,13 +400,13 @@ uint8_t getBfCharacter(uint8_t ch, uint8_t page)
 
     case SYM_HEADING_LINE:
         return BF_SYM_HEADING_LINE;
-/*
+
     case SYM_MAX:
         return BF_SYM_MAX;
 
     case SYM_PROFILE:
-        return BF_SYM_PROFILE;
-
+        return 'P';
+/*
     case SYM_SWITCH_INDICATOR_LOW:
         return BF_SYM_SWITCH_INDICATOR_LOW;
 
@@ -439,13 +436,13 @@ uint8_t getBfCharacter(uint8_t ch, uint8_t page)
 
     case SYM_AH_V_M_1:
         return BF_SYM_AH_V_M_1;
-
+*/
     case SYM_FLIGHT_MINS_REMAINING:
-        return BF_SYM_FLIGHT_MINS_REMAINING;
+        return BF_SYM_ON_M;
 
     case SYM_FLIGHT_HOURS_REMAINING:
-        return BF_SYM_FLIGHT_HOURS_REMAINING;
-
+        return BF_SYM_ON_H;
+/*
     case SYM_GROUND_COURSE:
         return BF_SYM_GROUND_COURSE;
 
@@ -620,19 +617,14 @@ uint8_t getBfCharacter(uint8_t ch, uint8_t page)
         return BF_SYM_AH_BAR9_5;
     case SYM_HUD_SIGNAL_4:
         return BF_SYM_AH_BAR9_7;
-/*
     case SYM_VARIO_UP_2A:
         return BF_SYM_VARIO_UP_2A;
-
     case SYM_VARIO_UP_1A:
         return BF_SYM_VARIO_UP_1A;
-
     case SYM_VARIO_DOWN_1A:
         return BF_SYM_VARIO_DOWN_1A;
-
     case SYM_VARIO_DOWN_2A:
         return BF_SYM_VARIO_DOWN_2A;
-*/
     case SYM_ALT:
         return BF_SYM_ALTITUDE;
 /*
@@ -650,10 +642,9 @@ uint8_t getBfCharacter(uint8_t ch, uint8_t page)
 
     case SYM_HUD_SIGNAL_4:
         return BF_SYM_HUD_SIGNAL_4;
-
-    case SYM_HOME_DIST:
-        return BF_SYM_HOME_DIST;
 */
+    case SYM_HOME_DIST:
+        return BF_SYM_HOMEFLAG;
 
     case SYM_AH_CH_CENTER:
     case (SYM_AH_CH_TYPE3+1):
@@ -741,7 +732,7 @@ uint8_t getBfCharacter(uint8_t ch, uint8_t page)
         break;
     }
 
-    return '*'; // Missing/not mapped character
+    return ' '; // Missing/not mapped character
 }
 
 #endif