Merge pull request #495 from ShikOfTheRa/Dev

Dev
ShikOfTheRa · Mar 13, 2018 · 6e57499 · 6e57499
2 parents 3ca3365 + 5257991
commit 6e57499
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 6 deletions.
diff --git a/MW_OSD/Config.h b/MW_OSD/Config.h
@@ -402,6 +402,7 @@
 #define ICON_TMP                    // Temperature
 #define ICON_DTH                    // Distance to home
 #define ICON_ALT                    // Altitude prime
+#define ICON_AGL                    // Altitude rangefinder
 #define ICON_GPS_ALT                // GPS altitude
 #define ICON_MAIN_BATT              // Main battery icon
 #define ICON_VID_BAT                // Video battery icon

diff --git a/MW_OSD/MW_OSD.ino b/MW_OSD/MW_OSD.ino
@@ -80,8 +80,8 @@ uint16_t UntouchedStack(void)
 
 //------------------------------------------------------------------------
 #define MWVERS "MW-OSD - R1.8.0.0"
-#define MWVERS "MW-OSD - R1.8 BUILD 4"
-#define MWOSDVERSION 1880 // 1660=1.6.6.0 for GUI
+#define MWVERS "MW-OSD - R1.8"
+#define MWOSDVERSION 1800 // 1660=1.6.6.0 for GUI
 #define EEPROMVER 15      // for eeprom layout verification
 
 #include <avr/pgmspace.h>

diff --git a/MW_OSD/Screen.ino b/MW_OSD/Screen.ino
@@ -1034,11 +1034,21 @@ void displayMAVAltitude(void){
     formatDistance(xx,0,0,0x2B);
     MAX7456_WriteString(screenBuffer,getPosition(MwGPSAltPosition));
   #else
+    xx=MAV_altitude/10;
+    int8_t dec_len=0;
+   while (xx!=0){
+      xx/=10;
+      dec_len++;
+    }
+    if (dec_len<2)
+      dec_len=2;
+    if (MAV_altitude<0)
+      dec_len++; 
     if(Settings[S_UNITSYSTEM])
       xx = MAV_altitude * 0.32808;  // in ft*10
     else
       xx = MAV_altitude/10  ;       // in cm*10
-    displayItem(MwGPSAltPosition,xx, 0x2B, 0, 4, 3 );
+    displayItem(MwGPSAltPosition,xx, SYM_AGL, 0, dec_len+1, dec_len );
   #endif  
 }
 

diff --git a/MW_OSD/fontB.h b/MW_OSD/fontB.h
diff --git a/MW_OSD/fontD.h b/MW_OSD/fontD.h
diff --git a/MW_OSD/fontL.h b/MW_OSD/fontL.h
diff --git a/MW_OSD/symbols.h b/MW_OSD/symbols.h
@@ -298,6 +298,12 @@
 #define SYM_ALT           0
 #endif
 
+#ifdef ICON_AGL
+#define SYM_AGL           0XC7
+#else
+#define SYM_AGL           0
+#endif
+
 #ifdef ICON_GPS_ALT
 #define SYM_GPS_ALT       0XBE
 #else

diff --git a/OTHER/FONT _EDITOR/Font code generator.xlsm b/OTHER/FONT _EDITOR/Font code generator.xlsm