display craft name, current mesurement on OSD

src/main/io/osd.c

@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
+#include <ctype.h>
 
 #include "platform.h"
 #include "version.h"
@@ -753,6 +754,28 @@ void updateOsd(void)
             sprintf(line+1, "%d.%1d", vbat / 10, vbat % 10);
             max7456_write_string(line, masterConfig.osdProfile.item_pos[OSD_MAIN_BATT_VOLTAGE]);
         }
+
+        if (masterConfig.osdProfile.item_pos[OSD_CURRENT_DRAW] != -1) {
+            line[0] = SYM_AMP;
+            sprintf(line+1, "%d.%02d", amperage / 100, amperage % 100);
+            max7456_write_string(line, masterConfig.osdProfile.item_pos[OSD_CURRENT_DRAW]);
+        }
+
+        if (masterConfig.osdProfile.item_pos[OSD_MAH_DRAWN] != -1) {
+            line[0] = SYM_MAH;
+            sprintf(line+1, "%d", mAhDrawn);
+            max7456_write_string(line, masterConfig.osdProfile.item_pos[OSD_MAH_DRAWN]);
+        }
+
+        if (masterConfig.osdProfile.item_pos[OSD_CRAFT_NAME] != -1) {
+            for (uint8_t i = 0; i < MAX_NAME_LENGTH; i++) {
+                line[i] = toupper((unsigned char)masterConfig.name[i]);
+                if (masterConfig.name[i] == 0)
+                    break;
+            }
+            max7456_write_string(line, masterConfig.osdProfile.item_pos[OSD_CRAFT_NAME]);
+        }
+
         if (masterConfig.osdProfile.item_pos[OSD_RSSI_VALUE] != -1) {
             line[0] = SYM_RSSI;
             sprintf(line+1, "%d", rssi / 10);
@@ -823,6 +846,9 @@ void resetOsdConfig(void)
     masterConfig.osdProfile.item_pos[OSD_DISARMED]           = -109;
     masterConfig.osdProfile.item_pos[OSD_ARTIFICIAL_HORIZON] = -1;
     masterConfig.osdProfile.item_pos[OSD_HORIZON_SIDEBARS]   = -1;
+    masterConfig.osdProfile.item_pos[OSD_CURRENT_DRAW]       = -23;
+    masterConfig.osdProfile.item_pos[OSD_MAH_DRAWN]          = -18;
+    masterConfig.osdProfile.item_pos[OSD_CRAFT_NAME]         = -77;
 }
 
 #endif

src/main/io/osd.h

@@ -50,6 +50,9 @@ typedef enum {
     OSD_DISARMED,
     OSD_ARTIFICIAL_HORIZON,
     OSD_HORIZON_SIDEBARS,
+    OSD_CURRENT_DRAW,
+    OSD_MAH_DRAWN,
+    OSD_CRAFT_NAME,
     OSD_MAX_ITEMS, // MUST BE LAST
 } osd_items_t;
 

src/main/io/serial_cli.c

@@ -893,6 +893,9 @@ const clivalue_t valueTable[] = {
     { "osd_disarmed_pos",           VAR_INT16  | MASTER_VALUE, &masterConfig.osdProfile.item_pos[OSD_DISARMED], .config.minmax = { -480, 480 } },
     { "osd_artificial_horizon",     VAR_INT16  | MASTER_VALUE, &masterConfig.osdProfile.item_pos[OSD_ARTIFICIAL_HORIZON], .config.minmax = { -1, 0 } },
     { "osd_horizon_sidebars",       VAR_INT16  | MASTER_VALUE, &masterConfig.osdProfile.item_pos[OSD_HORIZON_SIDEBARS], .config.minmax = { -1, 0 } },
+    { "osd_current_draw_pos",       VAR_INT16  | MASTER_VALUE, &masterConfig.osdProfile.item_pos[OSD_CURRENT_DRAW], .config.minmax = { -480, 480 } },
+    { "osd_mah_drawn_pos",          VAR_INT16  | MASTER_VALUE, &masterConfig.osdProfile.item_pos[OSD_MAH_DRAWN], .config.minmax = { -480, 480 } },
+    { "osd_craft_name_pos",         VAR_INT16  | MASTER_VALUE, &masterConfig.osdProfile.item_pos[OSD_CRAFT_NAME], .config.minmax = { -480, 480 } },
 #endif
 };
 

src/main/target/SIRINFPV/target.h

@@ -128,6 +128,8 @@
 #define USE_ADC
 #define ADC_INSTANCE            ADC1
 #define VBAT_ADC_PIN            PA0
+#define CURRENT_METER_ADC_PIN   PA3
+#define RSSI_ADC_PIN            PA2
 
 //#define USE_QUAD_MIXER_ONLY
 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT