AFC: REST API: actions and report: generated code

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

@@ -698,18 +698,30 @@ margin-bottom: 20px;
     var defs = {}
             defs.AFCActions = {
   "properties" : {
-    "ptt" : {
+    "deviceTrack" : {
       "type" : "integer",
-      "description" : "AFC action\n  * 0 - release\n  * 1 - engage\n"
+      "description" : "(Re)initialize tracker target frequency adjustment\n  * 0 - release\n  * 1 - engage\n"
+    },
+    "devicesApply" : {
+      "type" : "integer",
+      "description" : "(Re)initialize device sets tracking\n  * 0 - release\n  * 1 - engage\n"
     }
   },
   "description" : "AFC actions"
 };
             defs.AFCReport = {
   "properties" : {
-    "ptt" : {
+    "trackerChannelIndex" : {
       "type" : "integer",
-      "description" : "AFC status\n  * 0 - released\n  * 1 - engaged\n"
+      "description" : "Tracker index in device set"
+    },
+    "trackerDeviceFrequency" : {
+      "type" : "integer",
+      "format" : "int64"
+    },
+    "trackerChannelOffset" : {
+      "type" : "integer",
+      "description" : "Tracker channel offset from device center frequency"
     }
   },
   "description" : "AFC report"
@@ -744,8 +756,7 @@ margin-bottom: 20px;
       "description" : "Target frequency for the tracker"
     },
     "freqTolerance" : {
-      "type" : "integer",
+      "type" : "integer"
-      "format" : "int64"
     },
     "trackerAdjustPeriod" : {
       "type" : "integer",
@@ -40055,7 +40066,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2020-10-27T06:29:00.746+01:00
+              Generated 2020-10-27T06:34:40.143+01:00
             </div>
           </div>
       </div>

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

@@ -30,7 +30,6 @@ AFCSettings:
     freqTolerance:
       descritpion: Frequency shift tolerance before tracker frequency is (re)adjusted
       type: integer
-      format: int64
     trackerAdjustPeriod:
       description: Tracker channel frequency adjustment period in seconds
       type: integer
@@ -49,19 +48,29 @@ AFCSettings:
 AFCReport:
   description: "AFC report"
   properties:
-    ptt:
+    trackerChannelIndex:
+      description: Tracker index in device set
+      type: integer
+    trackerDeviceFrequency:
+      descritpion: Center frequency of tracker device
+      type: integer
+      format: int64
+    trackerChannelOffset:
+      description: Tracker channel offset from device center frequency
       type: integer
-      description: >
-        AFC status
-          * 0 - released
-          * 1 - engaged
 
 AFCActions:
   description: "AFC actions"
   properties:
-    ptt:
+    deviceTrack:
       type: integer
       description: >
-        AFC action
+        (Re)initialize tracker target frequency adjustment
+          * 0 - release
+          * 1 - engage
+    devicesApply:
+      type: integer
+      description: >
+        (Re)initialize device sets tracking
           * 0 - release
           * 1 - engage

swagger/sdrangel/code/html2/index.html

@@ -698,18 +698,30 @@ margin-bottom: 20px;
     var defs = {}
             defs.AFCActions = {
   "properties" : {
-    "ptt" : {
+    "deviceTrack" : {
       "type" : "integer",
-      "description" : "AFC action\n  * 0 - release\n  * 1 - engage\n"
+      "description" : "(Re)initialize tracker target frequency adjustment\n  * 0 - release\n  * 1 - engage\n"
+    },
+    "devicesApply" : {
+      "type" : "integer",
+      "description" : "(Re)initialize device sets tracking\n  * 0 - release\n  * 1 - engage\n"
     }
   },
   "description" : "AFC actions"
 };
             defs.AFCReport = {
   "properties" : {
-    "ptt" : {
+    "trackerChannelIndex" : {
       "type" : "integer",
-      "description" : "AFC status\n  * 0 - released\n  * 1 - engaged\n"
+      "description" : "Tracker index in device set"
+    },
+    "trackerDeviceFrequency" : {
+      "type" : "integer",
+      "format" : "int64"
+    },
+    "trackerChannelOffset" : {
+      "type" : "integer",
+      "description" : "Tracker channel offset from device center frequency"
     }
   },
   "description" : "AFC report"
@@ -744,8 +756,7 @@ margin-bottom: 20px;
       "description" : "Target frequency for the tracker"
     },
     "freqTolerance" : {
-      "type" : "integer",
+      "type" : "integer"
-      "format" : "int64"
     },
     "trackerAdjustPeriod" : {
       "type" : "integer",
@@ -40055,7 +40066,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2020-10-27T06:29:00.746+01:00
+              Generated 2020-10-27T06:34:40.143+01:00
             </div>
           </div>
       </div>

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

@@ -28,8 +28,10 @@ SWGAFCActions::SWGAFCActions(QString* json) {
 }
 
 SWGAFCActions::SWGAFCActions() {
-    ptt = 0;
+    device_track = 0;
-    m_ptt_isSet = false;
+    m_device_track_isSet = false;
+    devices_apply = 0;
+    m_devices_apply_isSet = false;
 }
 
 SWGAFCActions::~SWGAFCActions() {
@@ -38,13 +40,16 @@ SWGAFCActions::~SWGAFCActions() {
 
 void
 SWGAFCActions::init() {
-    ptt = 0;
+    device_track = 0;
-    m_ptt_isSet = false;
+    m_device_track_isSet = false;
+    devices_apply = 0;
+    m_devices_apply_isSet = false;
 }
 
 void
 SWGAFCActions::cleanup() {
 
+
 }
 
 SWGAFCActions*
@@ -58,7 +63,9 @@ SWGAFCActions::fromJson(QString &json) {
 
 void
 SWGAFCActions::fromJsonObject(QJsonObject &pJson) {
-    ::SWGSDRangel::setValue(&ptt, pJson["ptt"], "qint32", "");
+    ::SWGSDRangel::setValue(&device_track, pJson["deviceTrack"], "qint32", "");
+    
+    ::SWGSDRangel::setValue(&devices_apply, pJson["devicesApply"], "qint32", "");
     
 }
 
@@ -76,21 +83,34 @@ SWGAFCActions::asJson ()
 QJsonObject*
 SWGAFCActions::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
-    if(m_ptt_isSet){
+    if(m_device_track_isSet){
-        obj->insert("ptt", QJsonValue(ptt));
+        obj->insert("deviceTrack", QJsonValue(device_track));
+    }
+    if(m_devices_apply_isSet){
+        obj->insert("devicesApply", QJsonValue(devices_apply));
     }
 
     return obj;
 }
 
 qint32
-SWGAFCActions::getPtt() {
+SWGAFCActions::getDeviceTrack() {
-    return ptt;
+    return device_track;
 }
 void
-SWGAFCActions::setPtt(qint32 ptt) {
+SWGAFCActions::setDeviceTrack(qint32 device_track) {
-    this->ptt = ptt;
+    this->device_track = device_track;
-    this->m_ptt_isSet = true;
+    this->m_device_track_isSet = true;
+}
+
+qint32
+SWGAFCActions::getDevicesApply() {
+    return devices_apply;
+}
+void
+SWGAFCActions::setDevicesApply(qint32 devices_apply) {
+    this->devices_apply = devices_apply;
+    this->m_devices_apply_isSet = true;
 }
 
 
@@ -98,7 +118,10 @@ bool
 SWGAFCActions::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_ptt_isSet){
+        if(m_device_track_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_devices_apply_isSet){
             isObjectUpdated = true; break;
         }
     }while(false);

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

@@ -41,15 +41,21 @@ public:
     virtual void fromJsonObject(QJsonObject &json) override;
     virtual SWGAFCActions* fromJson(QString &jsonString) override;
 
-    qint32 getPtt();
+    qint32 getDeviceTrack();
-    void setPtt(qint32 ptt);
+    void setDeviceTrack(qint32 device_track);
+
+    qint32 getDevicesApply();
+    void setDevicesApply(qint32 devices_apply);
 
 
     virtual bool isSet() override;
 
 private:
-    qint32 ptt;
+    qint32 device_track;
-    bool m_ptt_isSet;
+    bool m_device_track_isSet;
+
+    qint32 devices_apply;
+    bool m_devices_apply_isSet;
 
 };
 

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

@@ -28,8 +28,12 @@ SWGAFCReport::SWGAFCReport(QString* json) {
 }
 
 SWGAFCReport::SWGAFCReport() {
-    ptt = 0;
+    tracker_channel_index = 0;
-    m_ptt_isSet = false;
+    m_tracker_channel_index_isSet = false;
+    tracker_device_frequency = 0L;
+    m_tracker_device_frequency_isSet = false;
+    tracker_channel_offset = 0;
+    m_tracker_channel_offset_isSet = false;
 }
 
 SWGAFCReport::~SWGAFCReport() {
@@ -38,13 +42,19 @@ SWGAFCReport::~SWGAFCReport() {
 
 void
 SWGAFCReport::init() {
-    ptt = 0;
+    tracker_channel_index = 0;
-    m_ptt_isSet = false;
+    m_tracker_channel_index_isSet = false;
+    tracker_device_frequency = 0L;
+    m_tracker_device_frequency_isSet = false;
+    tracker_channel_offset = 0;
+    m_tracker_channel_offset_isSet = false;
 }
 
 void
 SWGAFCReport::cleanup() {
 
+
+
 }
 
 SWGAFCReport*
@@ -58,7 +68,11 @@ SWGAFCReport::fromJson(QString &json) {
 
 void
 SWGAFCReport::fromJsonObject(QJsonObject &pJson) {
-    ::SWGSDRangel::setValue(&ptt, pJson["ptt"], "qint32", "");
+    ::SWGSDRangel::setValue(&tracker_channel_index, pJson["trackerChannelIndex"], "qint32", "");
+    
+    ::SWGSDRangel::setValue(&tracker_device_frequency, pJson["trackerDeviceFrequency"], "qint64", "");
+    
+    ::SWGSDRangel::setValue(&tracker_channel_offset, pJson["trackerChannelOffset"], "qint32", "");
     
 }
 
@@ -76,21 +90,47 @@ SWGAFCReport::asJson ()
 QJsonObject*
 SWGAFCReport::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
-    if(m_ptt_isSet){
+    if(m_tracker_channel_index_isSet){
-        obj->insert("ptt", QJsonValue(ptt));
+        obj->insert("trackerChannelIndex", QJsonValue(tracker_channel_index));
+    }
+    if(m_tracker_device_frequency_isSet){
+        obj->insert("trackerDeviceFrequency", QJsonValue(tracker_device_frequency));
+    }
+    if(m_tracker_channel_offset_isSet){
+        obj->insert("trackerChannelOffset", QJsonValue(tracker_channel_offset));
     }
 
     return obj;
 }
 
 qint32
-SWGAFCReport::getPtt() {
+SWGAFCReport::getTrackerChannelIndex() {
-    return ptt;
+    return tracker_channel_index;
 }
 void
-SWGAFCReport::setPtt(qint32 ptt) {
+SWGAFCReport::setTrackerChannelIndex(qint32 tracker_channel_index) {
-    this->ptt = ptt;
+    this->tracker_channel_index = tracker_channel_index;
-    this->m_ptt_isSet = true;
+    this->m_tracker_channel_index_isSet = true;
+}
+
+qint64
+SWGAFCReport::getTrackerDeviceFrequency() {
+    return tracker_device_frequency;
+}
+void
+SWGAFCReport::setTrackerDeviceFrequency(qint64 tracker_device_frequency) {
+    this->tracker_device_frequency = tracker_device_frequency;
+    this->m_tracker_device_frequency_isSet = true;
+}
+
+qint32
+SWGAFCReport::getTrackerChannelOffset() {
+    return tracker_channel_offset;
+}
+void
+SWGAFCReport::setTrackerChannelOffset(qint32 tracker_channel_offset) {
+    this->tracker_channel_offset = tracker_channel_offset;
+    this->m_tracker_channel_offset_isSet = true;
 }
 
 
@@ -98,7 +138,13 @@ bool
 SWGAFCReport::isSet(){
     bool isObjectUpdated = false;
     do{
-        if(m_ptt_isSet){
+        if(m_tracker_channel_index_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_tracker_device_frequency_isSet){
+            isObjectUpdated = true; break;
+        }
+        if(m_tracker_channel_offset_isSet){
             isObjectUpdated = true; break;
         }
     }while(false);

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

@@ -41,15 +41,27 @@ public:
     virtual void fromJsonObject(QJsonObject &json) override;
     virtual SWGAFCReport* fromJson(QString &jsonString) override;
 
-    qint32 getPtt();
+    qint32 getTrackerChannelIndex();
-    void setPtt(qint32 ptt);
+    void setTrackerChannelIndex(qint32 tracker_channel_index);
+
+    qint64 getTrackerDeviceFrequency();
+    void setTrackerDeviceFrequency(qint64 tracker_device_frequency);
+
+    qint32 getTrackerChannelOffset();
+    void setTrackerChannelOffset(qint32 tracker_channel_offset);
 
 
     virtual bool isSet() override;
 
 private:
-    qint32 ptt;
+    qint32 tracker_channel_index;
-    bool m_ptt_isSet;
+    bool m_tracker_channel_index_isSet;
+
+    qint64 tracker_device_frequency;
+    bool m_tracker_device_frequency_isSet;
+
+    qint32 tracker_channel_offset;
+    bool m_tracker_channel_offset_isSet;
 
 };
 

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

@@ -42,7 +42,7 @@ SWGAFCSettings::SWGAFCSettings() {
     m_transverter_target_isSet = false;
     target_frequency = 0L;
     m_target_frequency_isSet = false;
-    freq_tolerance = 0L;
+    freq_tolerance = 0;
     m_freq_tolerance_isSet = false;
     tracker_adjust_period = 0;
     m_tracker_adjust_period_isSet = false;
@@ -78,7 +78,7 @@ SWGAFCSettings::init() {
     m_transverter_target_isSet = false;
     target_frequency = 0L;
     m_target_frequency_isSet = false;
-    freq_tolerance = 0L;
+    freq_tolerance = 0;
     m_freq_tolerance_isSet = false;
     tracker_adjust_period = 0;
     m_tracker_adjust_period_isSet = false;
@@ -141,7 +141,7 @@ SWGAFCSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&target_frequency, pJson["targetFrequency"], "qint64", "");
     
-    ::SWGSDRangel::setValue(&freq_tolerance, pJson["freqTolerance"], "qint64", "");
+    ::SWGSDRangel::setValue(&freq_tolerance, pJson["freqTolerance"], "qint32", "");
     
     ::SWGSDRangel::setValue(&tracker_adjust_period, pJson["trackerAdjustPeriod"], "qint32", "");
     
@@ -287,12 +287,12 @@ SWGAFCSettings::setTargetFrequency(qint64 target_frequency) {
     this->m_target_frequency_isSet = true;
 }
 
-qint64
+qint32
 SWGAFCSettings::getFreqTolerance() {
     return freq_tolerance;
 }
 void
-SWGAFCSettings::setFreqTolerance(qint64 freq_tolerance) {
+SWGAFCSettings::setFreqTolerance(qint32 freq_tolerance) {
     this->freq_tolerance = freq_tolerance;
     this->m_freq_tolerance_isSet = true;
 }

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

@@ -63,8 +63,8 @@ public:
     qint64 getTargetFrequency();
     void setTargetFrequency(qint64 target_frequency);
 
-    qint64 getFreqTolerance();
+    qint32 getFreqTolerance();
-    void setFreqTolerance(qint64 freq_tolerance);
+    void setFreqTolerance(qint32 freq_tolerance);
 
     qint32 getTrackerAdjustPeriod();
     void setTrackerAdjustPeriod(qint32 tracker_adjust_period);
@@ -109,7 +109,7 @@ private:
     qint64 target_frequency;
     bool m_target_frequency_isSet;
 
-    qint64 freq_tolerance;
+    qint32 freq_tolerance;
     bool m_freq_tolerance_isSet;
 
     qint32 tracker_adjust_period;