Add GPIO pins to USRP and regen swagger

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

@@ -13451,6 +13451,18 @@ margin-bottom: 20px;
   "properties" : {
     "sampleRate" : {
       "type" : "integer"
+    },
+    "latitude" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "longitude" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "altitude" : {
+      "type" : "number",
+      "format" : "float"
     }
   },
   "description" : "RemoteTCPInput"
@@ -16824,6 +16836,14 @@ margin-bottom: 20px;
       "type" : "integer",
       "format" : "int64"
     },
+    "gpioDir" : {
+      "type" : "integer",
+      "format" : "int8"
+    },
+    "gpioPins" : {
+      "type" : "integer",
+      "format" : "int8"
+    },
     "useReverseAPI" : {
       "type" : "integer",
       "description" : "Synchronize with reverse API (1 for yes, 0 for no)"
@@ -16893,6 +16913,14 @@ margin-bottom: 20px;
       "type" : "integer",
       "format" : "int64"
     },
+    "gpioDir" : {
+      "type" : "integer",
+      "format" : "int8"
+    },
+    "gpioPins" : {
+      "type" : "integer",
+      "format" : "int8"
+    },
     "useReverseAPI" : {
       "type" : "integer",
       "description" : "Synchronize with reverse API (1 for yes, 0 for no)"
@@ -59441,7 +59469,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2024-07-16T23:20:27.082+02:00
+              Generated 2024-12-24T11:56:24.260+01:00
             </div>
           </div>
       </div>

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

@@ -61,3 +61,12 @@ RemoteTCPInputReport:
   properties:
     sampleRate:
       type: integer
+    latitude:
+      type: number
+      format: float
+    longitude:
+      type: number
+      format: float
+    altitude:
+      type: number
+      format: float

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

@@ -30,6 +30,12 @@ USRPInputSettings:
     transverterDeltaFrequency:
       type: integer
       format: int64
+    gpioDir:
+      type: integer
+      format: int8
+    gpioPins:
+      type: integer
+      format: int8
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer
@@ -65,6 +71,12 @@ USRPOutputSettings:
     transverterDeltaFrequency:
       type: integer
       format: int64
+    gpioDir:
+      type: integer
+      format: int8
+    gpioPins:
+      type: integer
+      format: int8
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

swagger/sdrangel/api/swagger/include/USRP.yaml

@@ -30,6 +30,12 @@ USRPInputSettings:
     transverterDeltaFrequency:
       type: integer
       format: int64
+    gpioDir:
+      type: integer
+      format: int8
+    gpioPins:
+      type: integer
+      format: int8
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer
@@ -65,6 +71,12 @@ USRPOutputSettings:
     transverterDeltaFrequency:
       type: integer
       format: int64
+    gpioDir:
+      type: integer
+      format: int8
+    gpioPins:
+      type: integer
+      format: int8
     useReverseAPI:
       description: Synchronize with reverse API (1 for yes, 0 for no)
       type: integer

swagger/sdrangel/code/html2/index.html

@@ -13451,6 +13451,18 @@ margin-bottom: 20px;
   "properties" : {
     "sampleRate" : {
       "type" : "integer"
+    },
+    "latitude" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "longitude" : {
+      "type" : "number",
+      "format" : "float"
+    },
+    "altitude" : {
+      "type" : "number",
+      "format" : "float"
     }
   },
   "description" : "RemoteTCPInput"
@@ -16824,6 +16836,14 @@ margin-bottom: 20px;
       "type" : "integer",
       "format" : "int64"
     },
+    "gpioDir" : {
+      "type" : "integer",
+      "format" : "int8"
+    },
+    "gpioPins" : {
+      "type" : "integer",
+      "format" : "int8"
+    },
     "useReverseAPI" : {
       "type" : "integer",
       "description" : "Synchronize with reverse API (1 for yes, 0 for no)"
@@ -16893,6 +16913,14 @@ margin-bottom: 20px;
       "type" : "integer",
       "format" : "int64"
     },
+    "gpioDir" : {
+      "type" : "integer",
+      "format" : "int8"
+    },
+    "gpioPins" : {
+      "type" : "integer",
+      "format" : "int8"
+    },
     "useReverseAPI" : {
       "type" : "integer",
       "description" : "Synchronize with reverse API (1 for yes, 0 for no)"
@@ -59441,7 +59469,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2024-07-16T23:20:27.082+02:00
+              Generated 2024-12-24T11:56:24.260+01:00
             </div>
           </div>
       </div>

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

@@ -30,6 +30,12 @@ SWGRemoteTCPInputReport::SWGRemoteTCPInputReport(QString* json) {
 SWGRemoteTCPInputReport::SWGRemoteTCPInputReport() {
     sample_rate = 0;
     m_sample_rate_isSet = false;
+    latitude = 0.0f;
+    m_latitude_isSet = false;
+    longitude = 0.0f;
+    m_longitude_isSet = false;
+    altitude = 0.0f;
+    m_altitude_isSet = false;
 }
 
 SWGRemoteTCPInputReport::~SWGRemoteTCPInputReport() {
@@ -40,11 +46,20 @@ void
 SWGRemoteTCPInputReport::init() {
     sample_rate = 0;
     m_sample_rate_isSet = false;
+    latitude = 0.0f;
+    m_latitude_isSet = false;
+    longitude = 0.0f;
+    m_longitude_isSet = false;
+    altitude = 0.0f;
+    m_altitude_isSet = false;
 }
 
 void
 SWGRemoteTCPInputReport::cleanup() {
 
+
+
+
 }
 
 SWGRemoteTCPInputReport*
@@ -60,6 +75,12 @@ void
 SWGRemoteTCPInputReport::fromJsonObject(QJsonObject &pJson) {
     ::SWGSDRangel::setValue(&sample_rate, pJson["sampleRate"], "qint32", "");
     
+    ::SWGSDRangel::setValue(&latitude, pJson["latitude"], "float", "");
+    
+    ::SWGSDRangel::setValue(&longitude, pJson["longitude"], "float", "");
+    
+    ::SWGSDRangel::setValue(&altitude, pJson["altitude"], "float", "");
+    
 }
 
 QString
@@ -79,9 +100,15 @@ SWGRemoteTCPInputReport::asJsonObject() {
     if(m_sample_rate_isSet){
         obj->insert("sampleRate", QJsonValue(sample_rate));
     }
+    if(m_latitude_isSet){
         obj->insert("latitude", QJsonValue(latitude));
+    }
+    if(m_longitude_isSet){
         obj->insert("longitude", QJsonValue(longitude));
+    }
+    if(m_altitude_isSet){
         obj->insert("altitude", QJsonValue(altitude));
+    }
 
     return obj;
 }
@@ -96,6 +123,36 @@ SWGRemoteTCPInputReport::setSampleRate(qint32 sample_rate) {
     this->m_sample_rate_isSet = true;
 }
 
+float
+SWGRemoteTCPInputReport::getLatitude() {
+    return latitude;
+}
+void
+SWGRemoteTCPInputReport::setLatitude(float latitude) {
+    this->latitude = latitude;
+    this->m_latitude_isSet = true;
+}
+
+float
+SWGRemoteTCPInputReport::getLongitude() {
+    return longitude;
+}
+void
+SWGRemoteTCPInputReport::setLongitude(float longitude) {
+    this->longitude = longitude;
+    this->m_longitude_isSet = true;
+}
+
+float
+SWGRemoteTCPInputReport::getAltitude() {
+    return altitude;
+}
+void
+SWGRemoteTCPInputReport::setAltitude(float altitude) {
+    this->altitude = altitude;
+    this->m_altitude_isSet = true;
+}
+
 
 bool
 SWGRemoteTCPInputReport::isSet(){
@@ -104,6 +161,15 @@ SWGRemoteTCPInputReport::isSet(){
         if(m_sample_rate_isSet){
             isObjectUpdated = true; break;
         }
+        if(m_latitude_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_longitude_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_altitude_isSet){
+            isObjectUpdated = true; break;
+        }
     }while(false);
     return isObjectUpdated;
 }

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

@@ -43,21 +43,31 @@ public:
 
     qint32 getSampleRate();
     void setSampleRate(qint32 sample_rate);
-    float getLatitude() { return latitude; }
+
-    float getLongitude() { return longitude; }
+    float getLatitude();
-    float getAltitude() { return altitude; }
+    void setLatitude(float latitude);
-    void setLatitude(float latitude) { this->latitude = latitude; }
+
-    void setLongitude(float longitude) { this->longitude = longitude; }
+    float getLongitude();
-    void setAltitude(float altitude) { this->altitude = altitude; }
+    void setLongitude(float longitude);
+
+    float getAltitude();
+    void setAltitude(float altitude);
+
 
     virtual bool isSet() override;
 
 private:
     qint32 sample_rate;
     bool m_sample_rate_isSet;
+
     float latitude;
+    bool m_latitude_isSet;
+
     float longitude;
+    bool m_longitude_isSet;
+
     float altitude;
+    bool m_altitude_isSet;
 
 };
 

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

@@ -54,6 +54,10 @@ SWGUSRPInputSettings::SWGUSRPInputSettings() {
     m_transverter_mode_isSet = false;
     transverter_delta_frequency = 0L;
     m_transverter_delta_frequency_isSet = false;
+    gpio_dir = 0;
+    m_gpio_dir_isSet = false;
+    gpio_pins = 0;
+    m_gpio_pins_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -96,6 +100,10 @@ SWGUSRPInputSettings::init() {
     m_transverter_mode_isSet = false;
     transverter_delta_frequency = 0L;
     m_transverter_delta_frequency_isSet = false;
+    gpio_dir = 0;
+    m_gpio_dir_isSet = false;
+    gpio_pins = 0;
+    m_gpio_pins_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -126,6 +134,8 @@ SWGUSRPInputSettings::cleanup() {
 
 
 
+
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -170,6 +180,10 @@ SWGUSRPInputSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", "");
     
+    ::SWGSDRangel::setValue(&gpio_dir, pJson["gpioDir"], "qint32", "");
+    
+    ::SWGSDRangel::setValue(&gpio_pins, pJson["gpioPins"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -233,6 +247,12 @@ SWGUSRPInputSettings::asJsonObject() {
     if(m_transverter_delta_frequency_isSet){
         obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency));
     }
+    if(m_gpio_dir_isSet){
+        obj->insert("gpioDir", QJsonValue(gpio_dir));
+    }
+    if(m_gpio_pins_isSet){
+        obj->insert("gpioPins", QJsonValue(gpio_pins));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -379,6 +399,26 @@ SWGUSRPInputSettings::setTransverterDeltaFrequency(qint64 transverter_delta_freq
     this->m_transverter_delta_frequency_isSet = true;
 }
 
+qint32
+SWGUSRPInputSettings::getGpioDir() {
+    return gpio_dir;
+}
+void
+SWGUSRPInputSettings::setGpioDir(qint32 gpio_dir) {
+    this->gpio_dir = gpio_dir;
+    this->m_gpio_dir_isSet = true;
+}
+
+qint32
+SWGUSRPInputSettings::getGpioPins() {
+    return gpio_pins;
+}
+void
+SWGUSRPInputSettings::setGpioPins(qint32 gpio_pins) {
+    this->gpio_pins = gpio_pins;
+    this->m_gpio_pins_isSet = true;
+}
+
 qint32
 SWGUSRPInputSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -463,6 +503,12 @@ SWGUSRPInputSettings::isSet(){
         if(m_transverter_delta_frequency_isSet){
             isObjectUpdated = true; break;
         }
+        if(m_gpio_dir_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gpio_pins_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

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

@@ -81,6 +81,12 @@ public:
     qint64 getTransverterDeltaFrequency();
     void setTransverterDeltaFrequency(qint64 transverter_delta_frequency);
 
+    qint32 getGpioDir();
+    void setGpioDir(qint32 gpio_dir);
+
+    qint32 getGpioPins();
+    void setGpioPins(qint32 gpio_pins);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -136,6 +142,12 @@ private:
     qint64 transverter_delta_frequency;
     bool m_transverter_delta_frequency_isSet;
 
+    qint32 gpio_dir;
+    bool m_gpio_dir_isSet;
+
+    qint32 gpio_pins;
+    bool m_gpio_pins_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;
 

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

@@ -48,6 +48,10 @@ SWGUSRPOutputSettings::SWGUSRPOutputSettings() {
     m_transverter_mode_isSet = false;
     transverter_delta_frequency = 0L;
     m_transverter_delta_frequency_isSet = false;
+    gpio_dir = 0;
+    m_gpio_dir_isSet = false;
+    gpio_pins = 0;
+    m_gpio_pins_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = nullptr;
@@ -84,6 +88,10 @@ SWGUSRPOutputSettings::init() {
     m_transverter_mode_isSet = false;
     transverter_delta_frequency = 0L;
     m_transverter_delta_frequency_isSet = false;
+    gpio_dir = 0;
+    m_gpio_dir_isSet = false;
+    gpio_pins = 0;
+    m_gpio_pins_isSet = false;
     use_reverse_api = 0;
     m_use_reverse_api_isSet = false;
     reverse_api_address = new QString("");
@@ -111,6 +119,8 @@ SWGUSRPOutputSettings::cleanup() {
 
 
 
+
+
     if(reverse_api_address != nullptr) { 
         delete reverse_api_address;
     }
@@ -149,6 +159,10 @@ SWGUSRPOutputSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", "");
     
+    ::SWGSDRangel::setValue(&gpio_dir, pJson["gpioDir"], "qint32", "");
+    
+    ::SWGSDRangel::setValue(&gpio_pins, pJson["gpioPins"], "qint32", "");
+    
     ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
     
     ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
@@ -203,6 +217,12 @@ SWGUSRPOutputSettings::asJsonObject() {
     if(m_transverter_delta_frequency_isSet){
         obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency));
     }
+    if(m_gpio_dir_isSet){
+        obj->insert("gpioDir", QJsonValue(gpio_dir));
+    }
+    if(m_gpio_pins_isSet){
+        obj->insert("gpioPins", QJsonValue(gpio_pins));
+    }
     if(m_use_reverse_api_isSet){
         obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
     }
@@ -319,6 +339,26 @@ SWGUSRPOutputSettings::setTransverterDeltaFrequency(qint64 transverter_delta_fre
     this->m_transverter_delta_frequency_isSet = true;
 }
 
+qint32
+SWGUSRPOutputSettings::getGpioDir() {
+    return gpio_dir;
+}
+void
+SWGUSRPOutputSettings::setGpioDir(qint32 gpio_dir) {
+    this->gpio_dir = gpio_dir;
+    this->m_gpio_dir_isSet = true;
+}
+
+qint32
+SWGUSRPOutputSettings::getGpioPins() {
+    return gpio_pins;
+}
+void
+SWGUSRPOutputSettings::setGpioPins(qint32 gpio_pins) {
+    this->gpio_pins = gpio_pins;
+    this->m_gpio_pins_isSet = true;
+}
+
 qint32
 SWGUSRPOutputSettings::getUseReverseApi() {
     return use_reverse_api;
@@ -394,6 +434,12 @@ SWGUSRPOutputSettings::isSet(){
         if(m_transverter_delta_frequency_isSet){
             isObjectUpdated = true; break;
         }
+        if(m_gpio_dir_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_gpio_pins_isSet){
+            isObjectUpdated = true; break;
+        }
         if(m_use_reverse_api_isSet){
             isObjectUpdated = true; break;
         }

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

@@ -72,6 +72,12 @@ public:
     qint64 getTransverterDeltaFrequency();
     void setTransverterDeltaFrequency(qint64 transverter_delta_frequency);
 
+    qint32 getGpioDir();
+    void setGpioDir(qint32 gpio_dir);
+
+    qint32 getGpioPins();
+    void setGpioPins(qint32 gpio_pins);
+
     qint32 getUseReverseApi();
     void setUseReverseApi(qint32 use_reverse_api);
 
@@ -118,6 +124,12 @@ private:
     qint64 transverter_delta_frequency;
     bool m_transverter_delta_frequency_isSet;
 
+    qint32 gpio_dir;
+    bool m_gpio_dir_isSet;
+
+    qint32 gpio_pins;
+    bool m_gpio_pins_isSet;
+
     qint32 use_reverse_api;
     bool m_use_reverse_api_isSet;