improved status page

RemoteIDModule/RemoteIDModule.ino

@@ -36,7 +36,7 @@ static BLE_TX ble;
 #define DEBUG_BAUDRATE 57600
 
 // OpenDroneID output data structure
-static ODID_UAS_Data UAS_data;
+ODID_UAS_Data UAS_data;
 static uint32_t last_location_ms;
 static WebInterface webif;
 
@@ -137,81 +137,6 @@ static const char *check_parse(void)
     return nullptr;
 }
 
-static String escape_string(String s)
-{
-    s.replace("\"", "");
-    return s;
-}
-
-/*
-  create a json string from a table
- */
-static String json_format(const json_table_t *table, uint8_t n)
-{
-    String s = "{";
-    for (uint8_t i=0; i<n; i++) {
-        const auto &t = table[i];
-        s += "\"" + t.name + "\" : ";
-        s += "\"" + escape_string(t.value) + "\"";
-        if (i != n-1) {
-            s += ",";
-        }
-    }
-    s += "}";
-    return s;
-}
-
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
-
-String status_json(void)
-{
-    const uint32_t now_s = millis() / 1000;
-    const uint32_t sec = now_s % 60;
-    const uint32_t min = (now_s / 60) % 60;
-    const uint32_t hr = (now_s / 3600) % 24;
-    const json_table_t table[] = {
-        { "STATUS:VERSION", String(FW_VERSION_MAJOR) + "." + String(FW_VERSION_MINOR) },
-        { "STATUS:UPTIME", String(hr) + ":" + String(min) + ":" + String(sec) },
-        { "STATUS:FREEMEM", String(ESP.getFreeHeap()) },
-        { "BASICID:UAType", String(UAS_data.BasicID[0].UAType) },
-        { "BASICID:IDType", String(UAS_data.BasicID[0].IDType) },
-        { "BASICID:UASID", String(UAS_data.BasicID[0].UASID) },
-        { "OPERATORID:IDType", String(UAS_data.OperatorID.OperatorIdType) },
-        { "OPERATORID:ID", String(UAS_data.OperatorID.OperatorId) },
-        { "SELFID:DescType", String(UAS_data.SelfID.DescType) },
-        { "SELFID:Desc", String(UAS_data.SelfID.Desc) },
-        { "SYSTEM:OperatorLocationType", String(UAS_data.System.OperatorLocationType) },
-        { "SYSTEM:ClassificationType", String(UAS_data.System.ClassificationType) },
-        { "SYSTEM:OperatorLatitude", String(UAS_data.System.OperatorLatitude) },
-        { "SYSTEM:OperatorLongitude", String(UAS_data.System.OperatorLongitude) },
-        { "SYSTEM:AreaCount", String(UAS_data.System.AreaCount) },
-        { "SYSTEM:AreaRadius", String(UAS_data.System.AreaRadius) },
-        { "SYSTEM:AreaCeiling", String(UAS_data.System.AreaCeiling) },
-        { "SYSTEM:AreaFloor", String(UAS_data.System.AreaFloor) },
-        { "SYSTEM:CategoryEU", String(UAS_data.System.CategoryEU) },
-        { "SYSTEM:ClassEU", String(UAS_data.System.ClassEU) },
-        { "SYSTEM:OperatorAltitudeGeo", String(UAS_data.System.OperatorAltitudeGeo) },
-        { "SYSTEM:Timestamp", String(UAS_data.System.Timestamp) },
-        { "LOCATION:Status", String(UAS_data.Location.Status) },
-        { "LOCATION:Direction", String(UAS_data.Location.Direction) },
-        { "LOCATION:SpeedHorizontal", String(UAS_data.Location.SpeedHorizontal) },
-        { "LOCATION:SpeedVertical", String(UAS_data.Location.SpeedVertical) },
-        { "LOCATION:Latitude", String(UAS_data.Location.Latitude) },
-        { "LOCATION:Longitude", String(UAS_data.Location.Longitude) },
-        { "LOCATION:AltitudeBaro", String(UAS_data.Location.AltitudeBaro) },
-        { "LOCATION:AltitudeGeo", String(UAS_data.Location.AltitudeGeo) },
-        { "LOCATION:HeightType", String(UAS_data.Location.HeightType) },
-        { "LOCATION:Height", String(UAS_data.Location.Height) },
-        { "LOCATION:HorizAccuracy", String(UAS_data.Location.HorizAccuracy) },
-        { "LOCATION:VertAccuracy", String(UAS_data.Location.VertAccuracy) },
-        { "LOCATION:BaroAccuracy", String(UAS_data.Location.BaroAccuracy) },
-        { "LOCATION:SpeedAccuracy", String(UAS_data.Location.SpeedAccuracy) },
-        { "LOCATION:TSAccuracy", String(UAS_data.Location.TSAccuracy) },
-        { "LOCATION:TimeStamp", String(UAS_data.Location.TimeStamp) },
-    };
-    return json_format(table, ARRAY_SIZE(table));
-}
-
 /*
   fill in UAS_data from MAVLink packets
  */

RemoteIDModule/status.cpp

@@ -0,0 +1,199 @@
+/*
+  handle status web page
+ */
+#include "options.h"
+#include <Arduino.h>
+#include "version.h"
+#include <opendroneid.h>
+#include "status.h"
+
+extern ODID_UAS_Data UAS_data;
+
+typedef struct {
+    String name;
+    String value;
+} json_table_t;
+
+static String escape_string(String s)
+{
+    s.replace("\"", "");
+    return s;
+}
+
+/*
+  create a json string from a table
+ */
+static String json_format(const json_table_t *table, uint8_t n)
+{
+    String s = "{";
+    for (uint8_t i=0; i<n; i++) {
+        const auto &t = table[i];
+        s += "\"" + t.name + "\" : ";
+        s += "\"" + escape_string(t.value) + "\"";
+        if (i != n-1) {
+            s += ",";
+        }
+    }
+    s += "}";
+    return s;
+}
+
+typedef struct {
+    int v;
+    String s;
+} enum_map_t;
+
+static const enum_map_t enum_uatype[] = {
+    { ODID_UATYPE_NONE , "NONE" },
+    { ODID_UATYPE_AEROPLANE , "AEROPLANE" },
+    { ODID_UATYPE_HELICOPTER_OR_MULTIROTOR , "HELICOPTER_OR_MULTIROTOR" },
+    { ODID_UATYPE_GYROPLANE , "GYROPLANE" },
+    { ODID_UATYPE_HYBRID_LIFT , "HYBRID_LIFT" },
+    { ODID_UATYPE_ORNITHOPTER , "ORNITHOPTER" },
+    { ODID_UATYPE_GLIDER , "GLIDER" },
+    { ODID_UATYPE_KITE , "KITE" },
+    { ODID_UATYPE_FREE_BALLOON , "FREE_BALLOON" },
+    { ODID_UATYPE_CAPTIVE_BALLOON , "CAPTIVE_BALLOON" },
+    { ODID_UATYPE_AIRSHIP , "AIRSHIP" },
+    { ODID_UATYPE_FREE_FALL_PARACHUTE , "FREE_FALL_PARACHUTE" },
+    { ODID_UATYPE_ROCKET , "ROCKET" },
+    { ODID_UATYPE_TETHERED_POWERED_AIRCRAFT , "TETHERED_POWERED_AIRCRAFT" },
+    { ODID_UATYPE_GROUND_OBSTACLE , "GROUND_OBSTACLE" },
+    { ODID_UATYPE_OTHER , "OTHER" },
+};
+
+static const enum_map_t enum_idtype[] = {
+    { ODID_IDTYPE_NONE , "NONE" },
+    { ODID_IDTYPE_SERIAL_NUMBER , "SERIAL_NUMBER" },
+    { ODID_IDTYPE_CAA_REGISTRATION_ID , "CAA_REGISTRATION_ID" },
+    { ODID_IDTYPE_UTM_ASSIGNED_UUID , "UTM_ASSIGNED_UUID" },
+    { ODID_IDTYPE_SPECIFIC_SESSION_ID , "SPECIFIC_SESSION_ID" },
+};
+
+static const enum_map_t enum_loctype[] = {
+    { ODID_OPERATOR_LOCATION_TYPE_TAKEOFF , "TAKEOFF" },
+    { ODID_OPERATOR_LOCATION_TYPE_LIVE_GNSS , "LIVE_GNSS" },
+    { ODID_OPERATOR_LOCATION_TYPE_FIXED , "FIXED" },
+};
+
+static const enum_map_t enum_classif[] = {
+    { ODID_CLASSIFICATION_TYPE_UNDECLARED , "UNDECLARED" },
+    { ODID_CLASSIFICATION_TYPE_EU , "EU" },
+};
+
+static const enum_map_t enum_status[] = {
+    { ODID_STATUS_UNDECLARED , "UNDECLARED" },
+    { ODID_STATUS_GROUND , "GROUND" },
+    { ODID_STATUS_AIRBORNE , "AIRBORNE" },
+    { ODID_STATUS_EMERGENCY , "EMERGENCY" },
+    { ODID_STATUS_REMOTE_ID_SYSTEM_FAILURE , "REMOTE_ID_SYSTEM_FAILURE" },
+};
+
+static const enum_map_t enum_height[] = {
+    { ODID_HEIGHT_REF_OVER_TAKEOFF , "REF_OVER_TAKEOFF" },
+    { ODID_HEIGHT_REF_OVER_GROUND , "REF_OVER_GROUND" },
+};
+
+static const enum_map_t enum_hacc[] = {
+    { ODID_HOR_ACC_UNKNOWN , "UNKNOWN" },
+    { ODID_HOR_ACC_10NM , "10NM" },
+    { ODID_HOR_ACC_4NM , "4NM" },
+    { ODID_HOR_ACC_2NM , "2NM" },
+    { ODID_HOR_ACC_1NM , "1NM" },
+    { ODID_HOR_ACC_0_5NM , "0_5NM" },
+    { ODID_HOR_ACC_0_3NM , "0_3NM" },
+    { ODID_HOR_ACC_0_1NM , "0_1NM" },
+    { ODID_HOR_ACC_0_05NM , "0_05NM" },
+    { ODID_HOR_ACC_30_METER , "30_METER" },
+    { ODID_HOR_ACC_10_METER , "10_METER" },
+    { ODID_HOR_ACC_3_METER , "3_METER" },
+    { ODID_HOR_ACC_1_METER , "1_METER" },
+};
+
+static const enum_map_t enum_vacc[] = {
+    { ODID_VER_ACC_UNKNOWN , "UNKNOWN" },
+    { ODID_VER_ACC_150_METER , "150_METER" },
+    { ODID_VER_ACC_45_METER , "45_METER" },
+    { ODID_VER_ACC_25_METER , "25_METER" },
+    { ODID_VER_ACC_10_METER , "10_METER" },
+    { ODID_VER_ACC_3_METER , "3_METER" },
+    { ODID_VER_ACC_1_METER , "1_METER" },
+};
+
+static const enum_map_t enum_sacc[] = {
+    { ODID_SPEED_ACC_UNKNOWN , "ACC_UNKNOWN" },
+    { ODID_SPEED_ACC_10_METERS_PER_SECOND , "ACC_10_METERS_PER_SECOND" },
+    { ODID_SPEED_ACC_3_METERS_PER_SECOND , "ACC_3_METERS_PER_SECOND" },
+    { ODID_SPEED_ACC_1_METERS_PER_SECOND , "ACC_1_METERS_PER_SECOND" },
+    { ODID_SPEED_ACC_0_3_METERS_PER_SECOND , "ACC_0_3_METERS_PER_SECOND" },
+};
+
+static const enum_map_t enum_desctype[] = {
+    { ODID_DESC_TYPE_TEXT , "TYPE_TEXT" },
+    { ODID_DESC_TYPE_EMERGENCY , "TYPE_EMERGENCY" },
+    { ODID_DESC_TYPE_EXTENDED_STATUS , "TYPE_EXTENDED_STATUS" },
+};
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+static String enum_string(const enum_map_t *m, uint8_t n, int v)
+{
+    for (uint8_t i=0; i<n; i++) {
+        if (m[i].v == v) {
+            return m[i].s;
+        }
+    }
+    return String(v);
+}
+
+#define ENUM_MAP(ename, v) enum_string(enum_ ## ename, ARRAY_SIZE(enum_ ## ename), int(v))
+
+String status_json(void)
+{
+    const uint32_t now_s = millis() / 1000;
+    const uint32_t sec = now_s % 60;
+    const uint32_t min = (now_s / 60) % 60;
+    const uint32_t hr = (now_s / 3600) % 24;
+    const json_table_t table[] = {
+        { "STATUS:VERSION", String(FW_VERSION_MAJOR) + "." + String(FW_VERSION_MINOR) },
+        { "STATUS:UPTIME", String(hr) + ":" + String(min) + ":" + String(sec) },
+        { "STATUS:FREEMEM", String(ESP.getFreeHeap()) },
+        { "BASICID:UAType", ENUM_MAP(uatype, UAS_data.BasicID[0].UAType) },
+        { "BASICID:IDType", ENUM_MAP(idtype, UAS_data.BasicID[0].IDType) },
+        { "BASICID:UASID", String(UAS_data.BasicID[0].UASID) },
+        { "OPERATORID:IDType", String(UAS_data.OperatorID.OperatorIdType) },
+        { "OPERATORID:ID", String(UAS_data.OperatorID.OperatorId) },
+        { "SELFID:DescType", ENUM_MAP(desctype, UAS_data.SelfID.DescType) },
+        { "SELFID:Desc", String(UAS_data.SelfID.Desc) },
+        { "SYSTEM:OperatorLocationType", ENUM_MAP(loctype, UAS_data.System.OperatorLocationType) },
+        { "SYSTEM:ClassificationType", ENUM_MAP(classif, UAS_data.System.ClassificationType) },
+        { "SYSTEM:OperatorLatitude", String(UAS_data.System.OperatorLatitude) },
+        { "SYSTEM:OperatorLongitude", String(UAS_data.System.OperatorLongitude) },
+        { "SYSTEM:AreaCount", String(UAS_data.System.AreaCount) },
+        { "SYSTEM:AreaRadius", String(UAS_data.System.AreaRadius) },
+        { "SYSTEM:AreaCeiling", String(UAS_data.System.AreaCeiling) },
+        { "SYSTEM:AreaFloor", String(UAS_data.System.AreaFloor) },
+        { "SYSTEM:CategoryEU", String(UAS_data.System.CategoryEU) },
+        { "SYSTEM:ClassEU", String(UAS_data.System.ClassEU) },
+        { "SYSTEM:OperatorAltitudeGeo", String(UAS_data.System.OperatorAltitudeGeo) },
+        { "SYSTEM:Timestamp", String(UAS_data.System.Timestamp) },
+        { "LOCATION:Status", ENUM_MAP(status, UAS_data.Location.Status) },
+        { "LOCATION:Direction", String(UAS_data.Location.Direction) },
+        { "LOCATION:SpeedHorizontal", String(UAS_data.Location.SpeedHorizontal) },
+        { "LOCATION:SpeedVertical", String(UAS_data.Location.SpeedVertical) },
+        { "LOCATION:Latitude", String(UAS_data.Location.Latitude) },
+        { "LOCATION:Longitude", String(UAS_data.Location.Longitude) },
+        { "LOCATION:AltitudeBaro", String(UAS_data.Location.AltitudeBaro) },
+        { "LOCATION:AltitudeGeo", String(UAS_data.Location.AltitudeGeo) },
+        { "LOCATION:HeightType", ENUM_MAP(height, UAS_data.Location.HeightType) },
+        { "LOCATION:Height", String(UAS_data.Location.Height) },
+        { "LOCATION:HorizAccuracy", ENUM_MAP(hacc, UAS_data.Location.HorizAccuracy) },
+        { "LOCATION:VertAccuracy", ENUM_MAP(vacc, UAS_data.Location.VertAccuracy) },
+        { "LOCATION:BaroAccuracy", ENUM_MAP(vacc, UAS_data.Location.BaroAccuracy) },
+        { "LOCATION:SpeedAccuracy", ENUM_MAP(sacc, UAS_data.Location.SpeedAccuracy) },
+        { "LOCATION:TSAccuracy", String(UAS_data.Location.TSAccuracy) },
+        { "LOCATION:TimeStamp", String(UAS_data.Location.TimeStamp) },
+    };
+    return json_format(table, ARRAY_SIZE(table));
+}
+

RemoteIDModule/status.h

@@ -0,0 +1,4 @@
+#pragma once
+
+String status_json(void);
+

RemoteIDModule/webinterface.cpp

@@ -9,6 +9,7 @@
 #include "parameters.h"
 #include "romfs.h"
 #include "check_firmware.h"
+#include "status.h"
 
 static WebServer server(80);
 
@@ -64,8 +65,6 @@ class ROMFS_Handler : public RequestHandler
 
 } ROMFS_Handler;
 
-extern String status_json(void);
-
 /*
   serve files from ROMFS
  */

RemoteIDModule/webinterface.h

@@ -7,11 +7,6 @@
 #include <Arduino.h>
 #include "version.h"
 
-typedef struct {
-    String name;
-    String value;
-} json_table_t;
-
 class WebInterface {
 public:
     void init(void);