Add aircraft state to MapItem

sdrbase/resources/webapi/doc/html2/index.html

@@ -9964,6 +9964,92 @@ margin-bottom: 20px;
     }
   },
   "description" : "Map"
+};
+            defs.MapAircraftState = {
+  "properties" : {
+    "airspeed" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Indicated airspeed in knots"
+    },
+    "trueAirspeed" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "True airspeed in knots"
+    },
+    "groundspeed" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Groundspeed in knots"
+    },
+    "mach" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "altitude" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Barometric altitude in feet"
+    },
+    "qnh" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "QNH in hPA"
+    },
+    "verticalSpeed" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "feet/s"
+    },
+    "heading" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Degrees magnetic"
+    },
+    "track" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Degrees true"
+    },
+    "selectedAirspeed" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "selectedAltitude" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "selectedHeading" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "autopilot" : {
+      "type" : "integer"
+    },
+    "verticalMode" : {
+      "type" : "integer"
+    },
+    "lateralModel" : {
+      "type" : "integer"
+    },
+    "tcasMode" : {
+      "type" : "integer",
+      "description" : "0 Off, 1 TA, 2 TA/RA"
+    },
+    "windSpeed" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "windDirection" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "staticAirTemperature" : {
+      "type" : "number",
+      "format" : "float"
+    }
+  },
+  "description" : "Aircraft state for PFD/ND"
 };
             defs.MapAnimation = {
   "properties" : {
@@ -10192,6 +10278,9 @@ margin-bottom: 20px;
     "color" : {
       "type" : "integer",
       "description" : "RGBA for polygon and polyline"
+    },
+    "aircraftState" : {
+      "$ref" : "#/definitions/MapAircraftState"
     }
   },
   "description" : "An item to draw on the map. Set image to an empty string to remove item from the map."
@@ -10356,6 +10445,9 @@ margin-bottom: 20px;
     "color" : {
       "type" : "integer",
       "description" : "RGBA for polygon and polyline"
+    },
+    "aircraftState" : {
+      "$ref" : "#/definitions/MapAircraftState"
     }
   },
   "description" : "An item to draw on the map. Set image to an empty string to remove item from the map."
@@ -59469,7 +59561,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2024-12-24T11:56:24.260+01:00
+              Generated 2025-01-03T12:29:40.000+01:00
             </div>
           </div>
       </div>

sdrbase/resources/webapi/doc/swagger/include/Map.yaml

@@ -168,6 +168,8 @@ MapItem:
     color:
       description: "RGBA for polygon and polyline"
       type: integer
+    aircraftState:
+      $ref: "/doc/swagger/include/Map.yaml#/MapAircraftState"
 
 MapAnimation:
   description: "Animation to play in the model on the 3D map"
@@ -221,3 +223,70 @@ MapCoordinate:
     dateTime:
       description: "Date and time at this coordinate (ISO 8601 extended format)"
       type: string
+
+MapAircraftState:
+  description: "Aircraft state for PFD/ND"
+  properties:
+    airspeed:
+      description: "Indicated airspeed in knots"
+      type: number
+      format: float
+    trueAirspeed:
+      description: "True airspeed in knots"
+      type: number
+      format: float
+    groundspeed:
+      description: "Groundspeed in knots"
+      type: number
+      format: float
+    mach:
+      type: number
+      format: float
+    altitude:
+      description: "Barometric altitude in feet"
+      type: number
+      format: float
+    qnh:
+      description: "QNH in hPA"
+      type: number
+      format: float
+    verticalSpeed:
+      description: "feet/s"
+      type: number
+      format: float      
+    heading:
+      description: "Degrees magnetic"
+      type: number
+      format: float
+    track:
+      description: "Degrees true"
+      type: number
+      format: float
+    selectedAirspeed:
+      type: number
+      format: float
+    selectedAltitude:
+      type: number
+      format: float
+    selectedHeading:
+      type: number
+      format: float
+    autopilot:
+      type: integer
+    verticalMode:
+      type: integer
+    lateralModel:
+      type: integer
+    tcasMode:
+      description: "0 Off, 1 TA, 2 TA/RA"
+      type: integer  
+    windSpeed:
+      type: number
+      format: float
+    windDirection:
+      type: number
+      format: float
+    staticAirTemperature:
+      type: number
+      format: float
+      

swagger/sdrangel/api/swagger/include/Map.yaml

@@ -168,6 +168,8 @@ MapItem:
     color:
       description: "RGBA for polygon and polyline"
       type: integer
+    aircraftState:
+      $ref: "http://swgserver:8081/api/swagger/include/Map.yaml#/MapAircraftState"
 
 MapAnimation:
   description: "Animation to play in the model on the 3D map"
@@ -221,3 +223,70 @@ MapCoordinate:
     dateTime:
       description: "Date and time at this coordinate (ISO 8601 extended format)"
       type: string
+
+MapAircraftState:
+  description: "Aircraft state for PFD/ND"
+  properties:
+    airspeed:
+      description: "Indicated airspeed in knots"
+      type: number
+      format: float
+    trueAirspeed:
+      description: "True airspeed in knots"
+      type: number
+      format: float
+    groundspeed:
+      description: "Groundspeed in knots"
+      type: number
+      format: float
+    mach:
+      type: number
+      format: float
+    altitude:
+      description: "Barometric altitude in feet"
+      type: number
+      format: float
+    qnh:
+      description: "QNH in hPA"
+      type: number
+      format: float
+    verticalSpeed:
+      description: "feet/s"
+      type: number
+      format: float      
+    heading:
+      description: "Degrees magnetic"
+      type: number
+      format: float
+    track:
+      description: "Degrees true"
+      type: number
+      format: float
+    selectedAirspeed:
+      type: number
+      format: float
+    selectedAltitude:
+      type: number
+      format: float
+    selectedHeading:
+      type: number
+      format: float
+    autopilot:
+      type: integer
+    verticalMode:
+      type: integer
+    lateralModel:
+      type: integer
+    tcasMode:
+      description: "0 Off, 1 TA, 2 TA/RA"
+      type: integer  
+    windSpeed:
+      type: number
+      format: float
+    windDirection:
+      type: number
+      format: float
+    staticAirTemperature:
+      type: number
+      format: float
+      

swagger/sdrangel/code/html2/index.html

@@ -9964,6 +9964,92 @@ margin-bottom: 20px;
     }
   },
   "description" : "Map"
+};
+            defs.MapAircraftState = {
+  "properties" : {
+    "airspeed" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Indicated airspeed in knots"
+    },
+    "trueAirspeed" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "True airspeed in knots"
+    },
+    "groundspeed" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Groundspeed in knots"
+    },
+    "mach" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "altitude" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Barometric altitude in feet"
+    },
+    "qnh" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "QNH in hPA"
+    },
+    "verticalSpeed" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "feet/s"
+    },
+    "heading" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Degrees magnetic"
+    },
+    "track" : {
+      "type" : "number",
+      "format" : "float",
+      "description" : "Degrees true"
+    },
+    "selectedAirspeed" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "selectedAltitude" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "selectedHeading" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "autopilot" : {
+      "type" : "integer"
+    },
+    "verticalMode" : {
+      "type" : "integer"
+    },
+    "lateralModel" : {
+      "type" : "integer"
+    },
+    "tcasMode" : {
+      "type" : "integer",
+      "description" : "0 Off, 1 TA, 2 TA/RA"
+    },
+    "windSpeed" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "windDirection" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "staticAirTemperature" : {
+      "type" : "number",
+      "format" : "float"
+    }
+  },
+  "description" : "Aircraft state for PFD/ND"
 };
             defs.MapAnimation = {
   "properties" : {
@@ -10192,6 +10278,9 @@ margin-bottom: 20px;
     "color" : {
       "type" : "integer",
       "description" : "RGBA for polygon and polyline"
+    },
+    "aircraftState" : {
+      "$ref" : "#/definitions/MapAircraftState"
     }
   },
   "description" : "An item to draw on the map. Set image to an empty string to remove item from the map."
@@ -10356,6 +10445,9 @@ margin-bottom: 20px;
     "color" : {
       "type" : "integer",
       "description" : "RGBA for polygon and polyline"
+    },
+    "aircraftState" : {
+      "$ref" : "#/definitions/MapAircraftState"
     }
   },
   "description" : "An item to draw on the map. Set image to an empty string to remove item from the map."
@@ -59469,7 +59561,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2024-12-24T11:56:24.260+01:00
+              Generated 2025-01-03T12:29:40.000+01:00
             </div>
           </div>
       </div>

swagger/sdrangel/code/qt5/client/SWGMapAircraftState.cpp

@@ -0,0 +1,522 @@
+/**
+ * SDRangel
+ * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube    ---   Limitations and specifcities:    * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method.   * Preset import and export from/to file is a server only feature.   * Device set focus is a GUI only feature.   * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator   * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time   * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time    --- 
+ *
+ * OpenAPI spec version: 7.0.0
+ * Contact: f4exb06@gmail.com
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+#include "SWGMapAircraftState.h"
+
+#include "SWGHelpers.h"
+
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QObject>
+#include <QDebug>
+
+namespace SWGSDRangel {
+
+SWGMapAircraftState::SWGMapAircraftState(QString* json) {
+    init();
+    this->fromJson(*json);
+}
+
+SWGMapAircraftState::SWGMapAircraftState() {
+    airspeed = 0.0f;
+    m_airspeed_isSet = false;
+    true_airspeed = 0.0f;
+    m_true_airspeed_isSet = false;
+    groundspeed = 0.0f;
+    m_groundspeed_isSet = false;
+    mach = 0.0f;
+    m_mach_isSet = false;
+    altitude = 0.0f;
+    m_altitude_isSet = false;
+    qnh = 0.0f;
+    m_qnh_isSet = false;
+    vertical_speed = 0.0f;
+    m_vertical_speed_isSet = false;
+    heading = 0.0f;
+    m_heading_isSet = false;
+    track = 0.0f;
+    m_track_isSet = false;
+    selected_airspeed = 0.0f;
+    m_selected_airspeed_isSet = false;
+    selected_altitude = 0.0f;
+    m_selected_altitude_isSet = false;
+    selected_heading = 0.0f;
+    m_selected_heading_isSet = false;
+    autopilot = 0;
+    m_autopilot_isSet = false;
+    vertical_mode = 0;
+    m_vertical_mode_isSet = false;
+    lateral_model = 0;
+    m_lateral_model_isSet = false;
+    tcas_mode = 0;
+    m_tcas_mode_isSet = false;
+    wind_speed = 0.0f;
+    m_wind_speed_isSet = false;
+    wind_direction = 0.0f;
+    m_wind_direction_isSet = false;
+    static_air_temperature = 0.0f;
+    m_static_air_temperature_isSet = false;
+}
+
+SWGMapAircraftState::~SWGMapAircraftState() {
+    this->cleanup();
+}
+
+void
+SWGMapAircraftState::init() {
+    airspeed = 0.0f;
+    m_airspeed_isSet = false;
+    true_airspeed = 0.0f;
+    m_true_airspeed_isSet = false;
+    groundspeed = 0.0f;
+    m_groundspeed_isSet = false;
+    mach = 0.0f;
+    m_mach_isSet = false;
+    altitude = 0.0f;
+    m_altitude_isSet = false;
+    qnh = 0.0f;
+    m_qnh_isSet = false;
+    vertical_speed = 0.0f;
+    m_vertical_speed_isSet = false;
+    heading = 0.0f;
+    m_heading_isSet = false;
+    track = 0.0f;
+    m_track_isSet = false;
+    selected_airspeed = 0.0f;
+    m_selected_airspeed_isSet = false;
+    selected_altitude = 0.0f;
+    m_selected_altitude_isSet = false;
+    selected_heading = 0.0f;
+    m_selected_heading_isSet = false;
+    autopilot = 0;
+    m_autopilot_isSet = false;
+    vertical_mode = 0;
+    m_vertical_mode_isSet = false;
+    lateral_model = 0;
+    m_lateral_model_isSet = false;
+    tcas_mode = 0;
+    m_tcas_mode_isSet = false;
+    wind_speed = 0.0f;
+    m_wind_speed_isSet = false;
+    wind_direction = 0.0f;
+    m_wind_direction_isSet = false;
+    static_air_temperature = 0.0f;
+    m_static_air_temperature_isSet = false;
+}
+
+void
+SWGMapAircraftState::cleanup() {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+
+SWGMapAircraftState*
+SWGMapAircraftState::fromJson(QString &json) {
+    QByteArray array (json.toStdString().c_str());
+    QJsonDocument doc = QJsonDocument::fromJson(array);
+    QJsonObject jsonObject = doc.object();
+    this->fromJsonObject(jsonObject);
+    return this;
+}
+
+void
+SWGMapAircraftState::fromJsonObject(QJsonObject &pJson) {
+    ::SWGSDRangel::setValue(&airspeed, pJson["airspeed"], "float", "");
+    
+    ::SWGSDRangel::setValue(&true_airspeed, pJson["trueAirspeed"], "float", "");
+    
+    ::SWGSDRangel::setValue(&groundspeed, pJson["groundspeed"], "float", "");
+    
+    ::SWGSDRangel::setValue(&mach, pJson["mach"], "float", "");
+    
+    ::SWGSDRangel::setValue(&altitude, pJson["altitude"], "float", "");
+    
+    ::SWGSDRangel::setValue(&qnh, pJson["qnh"], "float", "");
+    
+    ::SWGSDRangel::setValue(&vertical_speed, pJson["verticalSpeed"], "float", "");
+    
+    ::SWGSDRangel::setValue(&heading, pJson["heading"], "float", "");
+    
+    ::SWGSDRangel::setValue(&track, pJson["track"], "float", "");
+    
+    ::SWGSDRangel::setValue(&selected_airspeed, pJson["selectedAirspeed"], "float", "");
+    
+    ::SWGSDRangel::setValue(&selected_altitude, pJson["selectedAltitude"], "float", "");
+    
+    ::SWGSDRangel::setValue(&selected_heading, pJson["selectedHeading"], "float", "");
+    
+    ::SWGSDRangel::setValue(&autopilot, pJson["autopilot"], "qint32", "");
+    
+    ::SWGSDRangel::setValue(&vertical_mode, pJson["verticalMode"], "qint32", "");
+    
+    ::SWGSDRangel::setValue(&lateral_model, pJson["lateralModel"], "qint32", "");
+    
+    ::SWGSDRangel::setValue(&tcas_mode, pJson["tcasMode"], "qint32", "");
+    
+    ::SWGSDRangel::setValue(&wind_speed, pJson["windSpeed"], "float", "");
+    
+    ::SWGSDRangel::setValue(&wind_direction, pJson["windDirection"], "float", "");
+    
+    ::SWGSDRangel::setValue(&static_air_temperature, pJson["staticAirTemperature"], "float", "");
+    
+}
+
+QString
+SWGMapAircraftState::asJson ()
+{
+    QJsonObject* obj = this->asJsonObject();
+
+    QJsonDocument doc(*obj);
+    QByteArray bytes = doc.toJson();
+    delete obj;
+    return QString(bytes);
+}
+
+QJsonObject*
+SWGMapAircraftState::asJsonObject() {
+    QJsonObject* obj = new QJsonObject();
+    if(m_airspeed_isSet){
+        obj->insert("airspeed", QJsonValue(airspeed));
+    }
+    if(m_true_airspeed_isSet){
+        obj->insert("trueAirspeed", QJsonValue(true_airspeed));
+    }
+    if(m_groundspeed_isSet){
+        obj->insert("groundspeed", QJsonValue(groundspeed));
+    }
+    if(m_mach_isSet){
+        obj->insert("mach", QJsonValue(mach));
+    }
+    if(m_altitude_isSet){
+        obj->insert("altitude", QJsonValue(altitude));
+    }
+    if(m_qnh_isSet){
+        obj->insert("qnh", QJsonValue(qnh));
+    }
+    if(m_vertical_speed_isSet){
+        obj->insert("verticalSpeed", QJsonValue(vertical_speed));
+    }
+    if(m_heading_isSet){
+        obj->insert("heading", QJsonValue(heading));
+    }
+    if(m_track_isSet){
+        obj->insert("track", QJsonValue(track));
+    }
+    if(m_selected_airspeed_isSet){
+        obj->insert("selectedAirspeed", QJsonValue(selected_airspeed));
+    }
+    if(m_selected_altitude_isSet){
+        obj->insert("selectedAltitude", QJsonValue(selected_altitude));
+    }
+    if(m_selected_heading_isSet){
+        obj->insert("selectedHeading", QJsonValue(selected_heading));
+    }
+    if(m_autopilot_isSet){
+        obj->insert("autopilot", QJsonValue(autopilot));
+    }
+    if(m_vertical_mode_isSet){
+        obj->insert("verticalMode", QJsonValue(vertical_mode));
+    }
+    if(m_lateral_model_isSet){
+        obj->insert("lateralModel", QJsonValue(lateral_model));
+    }
+    if(m_tcas_mode_isSet){
+        obj->insert("tcasMode", QJsonValue(tcas_mode));
+    }
+    if(m_wind_speed_isSet){
+        obj->insert("windSpeed", QJsonValue(wind_speed));
+    }
+    if(m_wind_direction_isSet){
+        obj->insert("windDirection", QJsonValue(wind_direction));
+    }
+    if(m_static_air_temperature_isSet){
+        obj->insert("staticAirTemperature", QJsonValue(static_air_temperature));
+    }
+
+    return obj;
+}
+
+float
+SWGMapAircraftState::getAirspeed() {
+    return airspeed;
+}
+void
+SWGMapAircraftState::setAirspeed(float airspeed) {
+    this->airspeed = airspeed;
+    this->m_airspeed_isSet = true;
+}
+
+float
+SWGMapAircraftState::getTrueAirspeed() {
+    return true_airspeed;
+}
+void
+SWGMapAircraftState::setTrueAirspeed(float true_airspeed) {
+    this->true_airspeed = true_airspeed;
+    this->m_true_airspeed_isSet = true;
+}
+
+float
+SWGMapAircraftState::getGroundspeed() {
+    return groundspeed;
+}
+void
+SWGMapAircraftState::setGroundspeed(float groundspeed) {
+    this->groundspeed = groundspeed;
+    this->m_groundspeed_isSet = true;
+}
+
+float
+SWGMapAircraftState::getMach() {
+    return mach;
+}
+void
+SWGMapAircraftState::setMach(float mach) {
+    this->mach = mach;
+    this->m_mach_isSet = true;
+}
+
+float
+SWGMapAircraftState::getAltitude() {
+    return altitude;
+}
+void
+SWGMapAircraftState::setAltitude(float altitude) {
+    this->altitude = altitude;
+    this->m_altitude_isSet = true;
+}
+
+float
+SWGMapAircraftState::getQnh() {
+    return qnh;
+}
+void
+SWGMapAircraftState::setQnh(float qnh) {
+    this->qnh = qnh;
+    this->m_qnh_isSet = true;
+}
+
+float
+SWGMapAircraftState::getVerticalSpeed() {
+    return vertical_speed;
+}
+void
+SWGMapAircraftState::setVerticalSpeed(float vertical_speed) {
+    this->vertical_speed = vertical_speed;
+    this->m_vertical_speed_isSet = true;
+}
+
+float
+SWGMapAircraftState::getHeading() {
+    return heading;
+}
+void
+SWGMapAircraftState::setHeading(float heading) {
+    this->heading = heading;
+    this->m_heading_isSet = true;
+}
+
+float
+SWGMapAircraftState::getTrack() {
+    return track;
+}
+void
+SWGMapAircraftState::setTrack(float track) {
+    this->track = track;
+    this->m_track_isSet = true;
+}
+
+float
+SWGMapAircraftState::getSelectedAirspeed() {
+    return selected_airspeed;
+}
+void
+SWGMapAircraftState::setSelectedAirspeed(float selected_airspeed) {
+    this->selected_airspeed = selected_airspeed;
+    this->m_selected_airspeed_isSet = true;
+}
+
+float
+SWGMapAircraftState::getSelectedAltitude() {
+    return selected_altitude;
+}
+void
+SWGMapAircraftState::setSelectedAltitude(float selected_altitude) {
+    this->selected_altitude = selected_altitude;
+    this->m_selected_altitude_isSet = true;
+}
+
+float
+SWGMapAircraftState::getSelectedHeading() {
+    return selected_heading;
+}
+void
+SWGMapAircraftState::setSelectedHeading(float selected_heading) {
+    this->selected_heading = selected_heading;
+    this->m_selected_heading_isSet = true;
+}
+
+qint32
+SWGMapAircraftState::getAutopilot() {
+    return autopilot;
+}
+void
+SWGMapAircraftState::setAutopilot(qint32 autopilot) {
+    this->autopilot = autopilot;
+    this->m_autopilot_isSet = true;
+}
+
+qint32
+SWGMapAircraftState::getVerticalMode() {
+    return vertical_mode;
+}
+void
+SWGMapAircraftState::setVerticalMode(qint32 vertical_mode) {
+    this->vertical_mode = vertical_mode;
+    this->m_vertical_mode_isSet = true;
+}
+
+qint32
+SWGMapAircraftState::getLateralModel() {
+    return lateral_model;
+}
+void
+SWGMapAircraftState::setLateralModel(qint32 lateral_model) {
+    this->lateral_model = lateral_model;
+    this->m_lateral_model_isSet = true;
+}
+
+qint32
+SWGMapAircraftState::getTcasMode() {
+    return tcas_mode;
+}
+void
+SWGMapAircraftState::setTcasMode(qint32 tcas_mode) {
+    this->tcas_mode = tcas_mode;
+    this->m_tcas_mode_isSet = true;
+}
+
+float
+SWGMapAircraftState::getWindSpeed() {
+    return wind_speed;
+}
+void
+SWGMapAircraftState::setWindSpeed(float wind_speed) {
+    this->wind_speed = wind_speed;
+    this->m_wind_speed_isSet = true;
+}
+
+float
+SWGMapAircraftState::getWindDirection() {
+    return wind_direction;
+}
+void
+SWGMapAircraftState::setWindDirection(float wind_direction) {
+    this->wind_direction = wind_direction;
+    this->m_wind_direction_isSet = true;
+}
+
+float
+SWGMapAircraftState::getStaticAirTemperature() {
+    return static_air_temperature;
+}
+void
+SWGMapAircraftState::setStaticAirTemperature(float static_air_temperature) {
+    this->static_air_temperature = static_air_temperature;
+    this->m_static_air_temperature_isSet = true;
+}
+
+
+bool
+SWGMapAircraftState::isSet(){
+    bool isObjectUpdated = false;
+    do{
+        if(m_airspeed_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_true_airspeed_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_groundspeed_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_mach_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_altitude_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_qnh_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_vertical_speed_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_heading_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_track_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_selected_airspeed_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_selected_altitude_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_selected_heading_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_autopilot_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_vertical_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_lateral_model_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_tcas_mode_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_wind_speed_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_wind_direction_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_static_air_temperature_isSet){
+            isObjectUpdated = true; break;
+        }
+    }while(false);
+    return isObjectUpdated;
+}
+}
+

swagger/sdrangel/code/qt5/client/SWGMapAircraftState.h

@@ -0,0 +1,166 @@
+/**
+ * SDRangel
+ * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube    ---   Limitations and specifcities:    * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method.   * Preset import and export from/to file is a server only feature.   * Device set focus is a GUI only feature.   * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator   * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time   * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time    --- 
+ *
+ * OpenAPI spec version: 7.0.0
+ * Contact: f4exb06@gmail.com
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+/*
+ * SWGMapAircraftState.h
+ *
+ * Aircraft state for PFD/ND
+ */
+
+#ifndef SWGMapAircraftState_H_
+#define SWGMapAircraftState_H_
+
+#include <QJsonObject>
+
+
+
+#include "SWGObject.h"
+#include "export.h"
+
+namespace SWGSDRangel {
+
+class SWG_API SWGMapAircraftState: public SWGObject {
+public:
+    SWGMapAircraftState();
+    SWGMapAircraftState(QString* json);
+    virtual ~SWGMapAircraftState();
+    void init();
+    void cleanup();
+
+    virtual QString asJson () override;
+    virtual QJsonObject* asJsonObject() override;
+    virtual void fromJsonObject(QJsonObject &json) override;
+    virtual SWGMapAircraftState* fromJson(QString &jsonString) override;
+
+    float getAirspeed();
+    void setAirspeed(float airspeed);
+
+    float getTrueAirspeed();
+    void setTrueAirspeed(float true_airspeed);
+
+    float getGroundspeed();
+    void setGroundspeed(float groundspeed);
+
+    float getMach();
+    void setMach(float mach);
+
+    float getAltitude();
+    void setAltitude(float altitude);
+
+    float getQnh();
+    void setQnh(float qnh);
+
+    float getVerticalSpeed();
+    void setVerticalSpeed(float vertical_speed);
+
+    float getHeading();
+    void setHeading(float heading);
+
+    float getTrack();
+    void setTrack(float track);
+
+    float getSelectedAirspeed();
+    void setSelectedAirspeed(float selected_airspeed);
+
+    float getSelectedAltitude();
+    void setSelectedAltitude(float selected_altitude);
+
+    float getSelectedHeading();
+    void setSelectedHeading(float selected_heading);
+
+    qint32 getAutopilot();
+    void setAutopilot(qint32 autopilot);
+
+    qint32 getVerticalMode();
+    void setVerticalMode(qint32 vertical_mode);
+
+    qint32 getLateralModel();
+    void setLateralModel(qint32 lateral_model);
+
+    qint32 getTcasMode();
+    void setTcasMode(qint32 tcas_mode);
+
+    float getWindSpeed();
+    void setWindSpeed(float wind_speed);
+
+    float getWindDirection();
+    void setWindDirection(float wind_direction);
+
+    float getStaticAirTemperature();
+    void setStaticAirTemperature(float static_air_temperature);
+
+
+    virtual bool isSet() override;
+
+private:
+    float airspeed;
+    bool m_airspeed_isSet;
+
+    float true_airspeed;
+    bool m_true_airspeed_isSet;
+
+    float groundspeed;
+    bool m_groundspeed_isSet;
+
+    float mach;
+    bool m_mach_isSet;
+
+    float altitude;
+    bool m_altitude_isSet;
+
+    float qnh;
+    bool m_qnh_isSet;
+
+    float vertical_speed;
+    bool m_vertical_speed_isSet;
+
+    float heading;
+    bool m_heading_isSet;
+
+    float track;
+    bool m_track_isSet;
+
+    float selected_airspeed;
+    bool m_selected_airspeed_isSet;
+
+    float selected_altitude;
+    bool m_selected_altitude_isSet;
+
+    float selected_heading;
+    bool m_selected_heading_isSet;
+
+    qint32 autopilot;
+    bool m_autopilot_isSet;
+
+    qint32 vertical_mode;
+    bool m_vertical_mode_isSet;
+
+    qint32 lateral_model;
+    bool m_lateral_model_isSet;
+
+    qint32 tcas_mode;
+    bool m_tcas_mode_isSet;
+
+    float wind_speed;
+    bool m_wind_speed_isSet;
+
+    float wind_direction;
+    bool m_wind_direction_isSet;
+
+    float static_air_temperature;
+    bool m_static_air_temperature_isSet;
+
+};
+
+}
+
+#endif /* SWGMapAircraftState_H_ */

swagger/sdrangel/code/qt5/client/SWGMapItem.cpp

@@ -96,6 +96,8 @@ SWGMapItem::SWGMapItem() {
     m_color_valid_isSet = false;
     color = 0;
     m_color_isSet = false;
+    aircraft_state = nullptr;
+    m_aircraft_state_isSet = false;
 }
 
 SWGMapItem::~SWGMapItem() {
@@ -172,6 +174,8 @@ SWGMapItem::init() {
     m_color_valid_isSet = false;
     color = 0;
     m_color_isSet = false;
+    aircraft_state = new SWGMapAircraftState();
+    m_aircraft_state_isSet = false;
 }
 
 void
@@ -252,6 +256,9 @@ SWGMapItem::cleanup() {
     }
 
 
+    if(aircraft_state != nullptr) { 
+        delete aircraft_state;
+    }
 }
 
 SWGMapItem*
@@ -333,6 +340,8 @@ SWGMapItem::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&color, pJson["color"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&aircraft_state, pJson["aircraftState"], "SWGMapAircraftState", "SWGMapAircraftState");
+    
 }
 
 QString
@@ -451,6 +460,9 @@ SWGMapItem::asJsonObject() {
     if(m_color_isSet){
         obj->insert("color", QJsonValue(color));
     }
+    if((aircraft_state != nullptr) && (aircraft_state->isSet())){
+        toJsonValue(QString("aircraftState"), aircraft_state, obj, QString("SWGMapAircraftState"));
+    }
 
     return obj;
 }
@@ -795,6 +807,16 @@ SWGMapItem::setColor(qint32 color) {
     this->m_color_isSet = true;
 }
 
+SWGMapAircraftState*
+SWGMapItem::getAircraftState() {
+    return aircraft_state;
+}
+void
+SWGMapItem::setAircraftState(SWGMapAircraftState* aircraft_state) {
+    this->aircraft_state = aircraft_state;
+    this->m_aircraft_state_isSet = true;
+}
+
 
 bool
 SWGMapItem::isSet(){
@@ -902,6 +924,9 @@ SWGMapItem::isSet(){
         if(m_color_isSet){
             isObjectUpdated = true; break;
         }
+        if(aircraft_state && aircraft_state->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }

swagger/sdrangel/code/qt5/client/SWGMapItem.h

@@ -22,6 +22,7 @@
 #include <QJsonObject>
 
 
+#include "SWGMapAircraftState.h"
 #include "SWGMapAnimation.h"
 #include "SWGMapCoordinate.h"
 #include <QList>
@@ -147,6 +148,9 @@ public:
     qint32 getColor();
     void setColor(qint32 color);
 
+    SWGMapAircraftState* getAircraftState();
+    void setAircraftState(SWGMapAircraftState* aircraft_state);
+
 
     virtual bool isSet() override;
 
@@ -253,6 +257,9 @@ private:
     qint32 color;
     bool m_color_isSet;
 
+    SWGMapAircraftState* aircraft_state;
+    bool m_aircraft_state_isSet;
+
 };
 
 }

swagger/sdrangel/code/qt5/client/SWGMapItem_2.cpp

@@ -96,6 +96,8 @@ SWGMapItem_2::SWGMapItem_2() {
     m_color_valid_isSet = false;
     color = 0;
     m_color_isSet = false;
+    aircraft_state = nullptr;
+    m_aircraft_state_isSet = false;
 }
 
 SWGMapItem_2::~SWGMapItem_2() {
@@ -172,6 +174,8 @@ SWGMapItem_2::init() {
     m_color_valid_isSet = false;
     color = 0;
     m_color_isSet = false;
+    aircraft_state = new SWGMapAircraftState();
+    m_aircraft_state_isSet = false;
 }
 
 void
@@ -252,6 +256,9 @@ SWGMapItem_2::cleanup() {
     }
 
 
+    if(aircraft_state != nullptr) { 
+        delete aircraft_state;
+    }
 }
 
 SWGMapItem_2*
@@ -333,6 +340,8 @@ SWGMapItem_2::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&color, pJson["color"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&aircraft_state, pJson["aircraftState"], "SWGMapAircraftState", "SWGMapAircraftState");
+    
 }
 
 QString
@@ -451,6 +460,9 @@ SWGMapItem_2::asJsonObject() {
     if(m_color_isSet){
         obj->insert("color", QJsonValue(color));
     }
+    if((aircraft_state != nullptr) && (aircraft_state->isSet())){
+        toJsonValue(QString("aircraftState"), aircraft_state, obj, QString("SWGMapAircraftState"));
+    }
 
     return obj;
 }
@@ -795,6 +807,16 @@ SWGMapItem_2::setColor(qint32 color) {
     this->m_color_isSet = true;
 }
 
+SWGMapAircraftState*
+SWGMapItem_2::getAircraftState() {
+    return aircraft_state;
+}
+void
+SWGMapItem_2::setAircraftState(SWGMapAircraftState* aircraft_state) {
+    this->aircraft_state = aircraft_state;
+    this->m_aircraft_state_isSet = true;
+}
+
 
 bool
 SWGMapItem_2::isSet(){
@@ -902,6 +924,9 @@ SWGMapItem_2::isSet(){
         if(m_color_isSet){
             isObjectUpdated = true; break;
         }
+        if(aircraft_state && aircraft_state->isSet()){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }

swagger/sdrangel/code/qt5/client/SWGMapItem_2.h

@@ -22,6 +22,7 @@
 #include <QJsonObject>
 
 
+#include "SWGMapAircraftState.h"
 #include "SWGMapAnimation.h"
 #include "SWGMapCoordinate.h"
 #include <QList>
@@ -147,6 +148,9 @@ public:
     qint32 getColor();
     void setColor(qint32 color);
 
+    SWGMapAircraftState* getAircraftState();
+    void setAircraftState(SWGMapAircraftState* aircraft_state);
+
 
     virtual bool isSet() override;
 
@@ -253,6 +257,9 @@ private:
     qint32 color;
     bool m_color_isSet;
 
+    SWGMapAircraftState* aircraft_state;
+    bool m_aircraft_state_isSet;
+
 };
 
 }

swagger/sdrangel/code/qt5/client/SWGModelFactory.h

@@ -215,6 +215,7 @@
 #include "SWGM17ModReport.h"
 #include "SWGM17ModSettings.h"
 #include "SWGMapActions.h"
+#include "SWGMapAircraftState.h"
 #include "SWGMapAnimation.h"
 #include "SWGMapCoordinate.h"
 #include "SWGMapItem.h"
@@ -1396,6 +1397,11 @@ namespace SWGSDRangel {
       obj->init();
       return obj;
     }
+    if(QString("SWGMapAircraftState").compare(type) == 0) {
+      SWGMapAircraftState *obj = new SWGMapAircraftState();
+      obj->init();
+      return obj;
+    }
     if(QString("SWGMapAnimation").compare(type) == 0) {
       SWGMapAnimation *obj = new SWGMapAnimation();
       obj->init();