From 308b870063022a249c93bd5142fa47557bc2ddda Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 10 Sep 2020 15:23:18 +0200 Subject: [PATCH] REST API: chanded uint64 to int64 integer formats. Fixes #624 --- sdrbase/resources/webapi/doc/html2/index.html | 18 +++++++++--------- .../webapi/doc/swagger/include/LimeSdr.yaml | 4 ++-- .../webapi/doc/swagger/include/LocalInput.yaml | 2 +- .../doc/swagger/include/LocalOutput.yaml | 2 +- .../doc/swagger/include/RemoteInput.yaml | 2 +- .../doc/swagger/include/RemoteOutput.yaml | 2 +- .../webapi/doc/swagger/include/SDRPlay.yaml | 2 +- .../webapi/doc/swagger/include/TestMI.yaml | 2 +- .../webapi/doc/swagger/include/TestSource.yaml | 2 +- .../doc/swagger/include/TestSourceMI.yaml | 2 +- .../sdrangel/api/swagger/include/LimeSdr.yaml | 4 ++-- .../api/swagger/include/LocalInput.yaml | 2 +- .../api/swagger/include/LocalOutput.yaml | 2 +- .../api/swagger/include/RemoteInput.yaml | 2 +- .../api/swagger/include/RemoteOutput.yaml | 2 +- .../sdrangel/api/swagger/include/SDRPlay.yaml | 2 +- .../api/swagger/include/TestSource.yaml | 2 +- swagger/sdrangel/code/html2/index.html | 18 +++++++++--------- .../code/qt5/client/SWGLimeSdrInputReport.cpp | 10 +++++----- .../code/qt5/client/SWGLimeSdrInputReport.h | 6 +++--- .../code/qt5/client/SWGLimeSdrOutputReport.cpp | 10 +++++----- .../code/qt5/client/SWGLimeSdrOutputReport.h | 6 +++--- .../code/qt5/client/SWGLocalInputReport.cpp | 10 +++++----- .../code/qt5/client/SWGLocalInputReport.h | 6 +++--- .../code/qt5/client/SWGLocalOutputReport.cpp | 10 +++++----- .../code/qt5/client/SWGLocalOutputReport.h | 6 +++--- .../code/qt5/client/SWGRemoteInputReport.cpp | 10 +++++----- .../code/qt5/client/SWGRemoteInputReport.h | 6 +++--- .../qt5/client/SWGRemoteOutputSettings.cpp | 10 +++++----- .../code/qt5/client/SWGRemoteOutputSettings.h | 6 +++--- .../code/qt5/client/SWGSDRPlaySettings.cpp | 10 +++++----- .../code/qt5/client/SWGSDRPlaySettings.h | 6 +++--- .../code/qt5/client/SWGTestSourceSettings.cpp | 10 +++++----- .../code/qt5/client/SWGTestSourceSettings.h | 6 +++--- 34 files changed, 100 insertions(+), 100 deletions(-) diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index e235468df..45253089e 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -4236,7 +4236,7 @@ margin-bottom: 20px; }, "hwTimestamp" : { "type" : "integer", - "format" : "uint64", + "format" : "int64", "description" : "Hardware timestamp" }, "temperature" : { @@ -4380,7 +4380,7 @@ margin-bottom: 20px; }, "hwTimestamp" : { "type" : "integer", - "format" : "uint64", + "format" : "int64", "description" : "Hardware timestamp" }, "temperature" : { @@ -4475,7 +4475,7 @@ margin-bottom: 20px; "properties" : { "centerFrequency" : { "type" : "integer", - "format" : "uint64" + "format" : "int64" }, "sampleRate" : { "type" : "integer" @@ -4511,7 +4511,7 @@ margin-bottom: 20px; "properties" : { "centerFrequency" : { "type" : "integer", - "format" : "uint64" + "format" : "int64" }, "sampleRate" : { "type" : "integer" @@ -5443,7 +5443,7 @@ margin-bottom: 20px; "properties" : { "centerFrequency" : { "type" : "integer", - "format" : "uint64" + "format" : "int64" }, "sampleRate" : { "type" : "integer" @@ -5528,7 +5528,7 @@ margin-bottom: 20px; "properties" : { "centerFrequency" : { "type" : "integer", - "format" : "uint64" + "format" : "int64" }, "sampleRate" : { "type" : "integer" @@ -5841,7 +5841,7 @@ margin-bottom: 20px; "properties" : { "centerFrequency" : { "type" : "integer", - "format" : "uint64" + "format" : "int64" }, "tunerGain" : { "type" : "integer" @@ -6486,7 +6486,7 @@ margin-bottom: 20px; "properties" : { "centerFrequency" : { "type" : "integer", - "format" : "uint64" + "format" : "int64" }, "frequencyShift" : { "type" : "integer" @@ -33319,7 +33319,7 @@ except ApiException as e:
- Generated 2020-08-27T07:43:19.609+02:00 + Generated 2020-09-10T15:07:12.501+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/LimeSdr.yaml b/sdrbase/resources/webapi/doc/swagger/include/LimeSdr.yaml index df2e22497..547b7758a 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/LimeSdr.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/LimeSdr.yaml @@ -143,7 +143,7 @@ LimeSdrInputReport: hwTimestamp: description: Hardware timestamp type: integer - format: uint64 + format: int64 temperature: type: number format: float @@ -179,7 +179,7 @@ LimeSdrOutputReport: hwTimestamp: description: Hardware timestamp type: integer - format: uint64 + format: int64 temperature: type: number format: float diff --git a/sdrbase/resources/webapi/doc/swagger/include/LocalInput.yaml b/sdrbase/resources/webapi/doc/swagger/include/LocalInput.yaml index cb4a0ef00..010a144d9 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/LocalInput.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/LocalInput.yaml @@ -20,6 +20,6 @@ LocalInputReport: properties: centerFrequency: type: integer - format: uint64 + format: int64 sampleRate: type: integer diff --git a/sdrbase/resources/webapi/doc/swagger/include/LocalOutput.yaml b/sdrbase/resources/webapi/doc/swagger/include/LocalOutput.yaml index d5369e12a..3ae0bb37c 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/LocalOutput.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/LocalOutput.yaml @@ -16,6 +16,6 @@ LocalOutputReport: properties: centerFrequency: type: integer - format: uint64 + format: int64 sampleRate: type: integer diff --git a/sdrbase/resources/webapi/doc/swagger/include/RemoteInput.yaml b/sdrbase/resources/webapi/doc/swagger/include/RemoteInput.yaml index 2f6c14bac..d3a8ddba0 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/RemoteInput.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/RemoteInput.yaml @@ -36,7 +36,7 @@ RemoteInputReport: properties: centerFrequency: type: integer - format: uint64 + format: int64 sampleRate: type: integer bufferRWBalance: diff --git a/sdrbase/resources/webapi/doc/swagger/include/RemoteOutput.yaml b/sdrbase/resources/webapi/doc/swagger/include/RemoteOutput.yaml index 5301020b8..fdcda0716 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/RemoteOutput.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/RemoteOutput.yaml @@ -3,7 +3,7 @@ RemoteOutputSettings: properties: centerFrequency: type: integer - format: uint64 + format: int64 sampleRate: type: integer txDelay: diff --git a/sdrbase/resources/webapi/doc/swagger/include/SDRPlay.yaml b/sdrbase/resources/webapi/doc/swagger/include/SDRPlay.yaml index 528a5a70e..c0c7b610a 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SDRPlay.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SDRPlay.yaml @@ -3,7 +3,7 @@ SDRPlaySettings: properties: centerFrequency: type: integer - format: uint64 + format: int64 tunerGain: type: integer LOppmTenths: diff --git a/sdrbase/resources/webapi/doc/swagger/include/TestMI.yaml b/sdrbase/resources/webapi/doc/swagger/include/TestMI.yaml index 0c8c3a481..aae286395 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/TestMI.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/TestMI.yaml @@ -27,7 +27,7 @@ definitions: type: integer centerFrequency: type: integer - format: uint64 + format: int64 frequencyShift: type: integer sampleRate: diff --git a/sdrbase/resources/webapi/doc/swagger/include/TestSource.yaml b/sdrbase/resources/webapi/doc/swagger/include/TestSource.yaml index 01443cf61..e16774cf0 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/TestSource.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/TestSource.yaml @@ -3,7 +3,7 @@ TestSourceSettings: properties: centerFrequency: type: integer - format: uint64 + format: int64 frequencyShift: type: integer sampleRate: diff --git a/sdrbase/resources/webapi/doc/swagger/include/TestSourceMI.yaml b/sdrbase/resources/webapi/doc/swagger/include/TestSourceMI.yaml index 763108033..5d4fd22dc 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/TestSourceMI.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/TestSourceMI.yaml @@ -3,7 +3,7 @@ TestSourceMISettings: properties: centerFrequency: type: integer - format: uint64 + format: int64 frequencyShift: type: integer sampleRate: diff --git a/swagger/sdrangel/api/swagger/include/LimeSdr.yaml b/swagger/sdrangel/api/swagger/include/LimeSdr.yaml index df2e22497..547b7758a 100644 --- a/swagger/sdrangel/api/swagger/include/LimeSdr.yaml +++ b/swagger/sdrangel/api/swagger/include/LimeSdr.yaml @@ -143,7 +143,7 @@ LimeSdrInputReport: hwTimestamp: description: Hardware timestamp type: integer - format: uint64 + format: int64 temperature: type: number format: float @@ -179,7 +179,7 @@ LimeSdrOutputReport: hwTimestamp: description: Hardware timestamp type: integer - format: uint64 + format: int64 temperature: type: number format: float diff --git a/swagger/sdrangel/api/swagger/include/LocalInput.yaml b/swagger/sdrangel/api/swagger/include/LocalInput.yaml index cb4a0ef00..010a144d9 100644 --- a/swagger/sdrangel/api/swagger/include/LocalInput.yaml +++ b/swagger/sdrangel/api/swagger/include/LocalInput.yaml @@ -20,6 +20,6 @@ LocalInputReport: properties: centerFrequency: type: integer - format: uint64 + format: int64 sampleRate: type: integer diff --git a/swagger/sdrangel/api/swagger/include/LocalOutput.yaml b/swagger/sdrangel/api/swagger/include/LocalOutput.yaml index d5369e12a..3ae0bb37c 100644 --- a/swagger/sdrangel/api/swagger/include/LocalOutput.yaml +++ b/swagger/sdrangel/api/swagger/include/LocalOutput.yaml @@ -16,6 +16,6 @@ LocalOutputReport: properties: centerFrequency: type: integer - format: uint64 + format: int64 sampleRate: type: integer diff --git a/swagger/sdrangel/api/swagger/include/RemoteInput.yaml b/swagger/sdrangel/api/swagger/include/RemoteInput.yaml index 2f6c14bac..d3a8ddba0 100644 --- a/swagger/sdrangel/api/swagger/include/RemoteInput.yaml +++ b/swagger/sdrangel/api/swagger/include/RemoteInput.yaml @@ -36,7 +36,7 @@ RemoteInputReport: properties: centerFrequency: type: integer - format: uint64 + format: int64 sampleRate: type: integer bufferRWBalance: diff --git a/swagger/sdrangel/api/swagger/include/RemoteOutput.yaml b/swagger/sdrangel/api/swagger/include/RemoteOutput.yaml index 5301020b8..fdcda0716 100644 --- a/swagger/sdrangel/api/swagger/include/RemoteOutput.yaml +++ b/swagger/sdrangel/api/swagger/include/RemoteOutput.yaml @@ -3,7 +3,7 @@ RemoteOutputSettings: properties: centerFrequency: type: integer - format: uint64 + format: int64 sampleRate: type: integer txDelay: diff --git a/swagger/sdrangel/api/swagger/include/SDRPlay.yaml b/swagger/sdrangel/api/swagger/include/SDRPlay.yaml index f3fdcab02..c1d84bc11 100644 --- a/swagger/sdrangel/api/swagger/include/SDRPlay.yaml +++ b/swagger/sdrangel/api/swagger/include/SDRPlay.yaml @@ -3,7 +3,7 @@ SDRPlaySettings: properties: centerFrequency: type: integer - format: uint64 + format: int64 tunerGain: type: integer LOppmTenths: diff --git a/swagger/sdrangel/api/swagger/include/TestSource.yaml b/swagger/sdrangel/api/swagger/include/TestSource.yaml index 01443cf61..e16774cf0 100644 --- a/swagger/sdrangel/api/swagger/include/TestSource.yaml +++ b/swagger/sdrangel/api/swagger/include/TestSource.yaml @@ -3,7 +3,7 @@ TestSourceSettings: properties: centerFrequency: type: integer - format: uint64 + format: int64 frequencyShift: type: integer sampleRate: diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index e235468df..45253089e 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -4236,7 +4236,7 @@ margin-bottom: 20px; }, "hwTimestamp" : { "type" : "integer", - "format" : "uint64", + "format" : "int64", "description" : "Hardware timestamp" }, "temperature" : { @@ -4380,7 +4380,7 @@ margin-bottom: 20px; }, "hwTimestamp" : { "type" : "integer", - "format" : "uint64", + "format" : "int64", "description" : "Hardware timestamp" }, "temperature" : { @@ -4475,7 +4475,7 @@ margin-bottom: 20px; "properties" : { "centerFrequency" : { "type" : "integer", - "format" : "uint64" + "format" : "int64" }, "sampleRate" : { "type" : "integer" @@ -4511,7 +4511,7 @@ margin-bottom: 20px; "properties" : { "centerFrequency" : { "type" : "integer", - "format" : "uint64" + "format" : "int64" }, "sampleRate" : { "type" : "integer" @@ -5443,7 +5443,7 @@ margin-bottom: 20px; "properties" : { "centerFrequency" : { "type" : "integer", - "format" : "uint64" + "format" : "int64" }, "sampleRate" : { "type" : "integer" @@ -5528,7 +5528,7 @@ margin-bottom: 20px; "properties" : { "centerFrequency" : { "type" : "integer", - "format" : "uint64" + "format" : "int64" }, "sampleRate" : { "type" : "integer" @@ -5841,7 +5841,7 @@ margin-bottom: 20px; "properties" : { "centerFrequency" : { "type" : "integer", - "format" : "uint64" + "format" : "int64" }, "tunerGain" : { "type" : "integer" @@ -6486,7 +6486,7 @@ margin-bottom: 20px; "properties" : { "centerFrequency" : { "type" : "integer", - "format" : "uint64" + "format" : "int64" }, "frequencyShift" : { "type" : "integer" @@ -33319,7 +33319,7 @@ except ApiException as e:
- Generated 2020-08-27T07:43:19.609+02:00 + Generated 2020-09-10T15:07:12.501+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputReport.cpp b/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputReport.cpp index 476b2ad65..5763be9b1 100644 --- a/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputReport.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputReport.cpp @@ -44,7 +44,7 @@ SWGLimeSdrInputReport::SWGLimeSdrInputReport() { m_dropped_packets_count_isSet = false; link_rate = 0.0f; m_link_rate_isSet = false; - hw_timestamp = 0; + hw_timestamp = 0L; m_hw_timestamp_isSet = false; temperature = 0.0f; m_temperature_isSet = false; @@ -76,7 +76,7 @@ SWGLimeSdrInputReport::init() { m_dropped_packets_count_isSet = false; link_rate = 0.0f; m_link_rate_isSet = false; - hw_timestamp = 0; + hw_timestamp = 0L; m_hw_timestamp_isSet = false; temperature = 0.0f; m_temperature_isSet = false; @@ -129,7 +129,7 @@ SWGLimeSdrInputReport::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&link_rate, pJson["linkRate"], "float", ""); - ::SWGSDRangel::setValue(&hw_timestamp, pJson["hwTimestamp"], "qint32", ""); + ::SWGSDRangel::setValue(&hw_timestamp, pJson["hwTimestamp"], "qint64", ""); ::SWGSDRangel::setValue(&temperature, pJson["temperature"], "float", ""); @@ -273,12 +273,12 @@ SWGLimeSdrInputReport::setLinkRate(float link_rate) { this->m_link_rate_isSet = true; } -qint32 +qint64 SWGLimeSdrInputReport::getHwTimestamp() { return hw_timestamp; } void -SWGLimeSdrInputReport::setHwTimestamp(qint32 hw_timestamp) { +SWGLimeSdrInputReport::setHwTimestamp(qint64 hw_timestamp) { this->hw_timestamp = hw_timestamp; this->m_hw_timestamp_isSet = true; } diff --git a/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputReport.h b/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputReport.h index afbf6da9a..2cea169bd 100644 --- a/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputReport.h +++ b/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputReport.h @@ -65,8 +65,8 @@ public: float getLinkRate(); void setLinkRate(float link_rate); - qint32 getHwTimestamp(); - void setHwTimestamp(qint32 hw_timestamp); + qint64 getHwTimestamp(); + void setHwTimestamp(qint64 hw_timestamp); float getTemperature(); void setTemperature(float temperature); @@ -105,7 +105,7 @@ private: float link_rate; bool m_link_rate_isSet; - qint32 hw_timestamp; + qint64 hw_timestamp; bool m_hw_timestamp_isSet; float temperature; diff --git a/swagger/sdrangel/code/qt5/client/SWGLimeSdrOutputReport.cpp b/swagger/sdrangel/code/qt5/client/SWGLimeSdrOutputReport.cpp index 2001751fa..e97c9c929 100644 --- a/swagger/sdrangel/code/qt5/client/SWGLimeSdrOutputReport.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGLimeSdrOutputReport.cpp @@ -44,7 +44,7 @@ SWGLimeSdrOutputReport::SWGLimeSdrOutputReport() { m_dropped_packets_count_isSet = false; link_rate = 0.0f; m_link_rate_isSet = false; - hw_timestamp = 0; + hw_timestamp = 0L; m_hw_timestamp_isSet = false; temperature = 0.0f; m_temperature_isSet = false; @@ -76,7 +76,7 @@ SWGLimeSdrOutputReport::init() { m_dropped_packets_count_isSet = false; link_rate = 0.0f; m_link_rate_isSet = false; - hw_timestamp = 0; + hw_timestamp = 0L; m_hw_timestamp_isSet = false; temperature = 0.0f; m_temperature_isSet = false; @@ -129,7 +129,7 @@ SWGLimeSdrOutputReport::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&link_rate, pJson["linkRate"], "float", ""); - ::SWGSDRangel::setValue(&hw_timestamp, pJson["hwTimestamp"], "qint32", ""); + ::SWGSDRangel::setValue(&hw_timestamp, pJson["hwTimestamp"], "qint64", ""); ::SWGSDRangel::setValue(&temperature, pJson["temperature"], "float", ""); @@ -273,12 +273,12 @@ SWGLimeSdrOutputReport::setLinkRate(float link_rate) { this->m_link_rate_isSet = true; } -qint32 +qint64 SWGLimeSdrOutputReport::getHwTimestamp() { return hw_timestamp; } void -SWGLimeSdrOutputReport::setHwTimestamp(qint32 hw_timestamp) { +SWGLimeSdrOutputReport::setHwTimestamp(qint64 hw_timestamp) { this->hw_timestamp = hw_timestamp; this->m_hw_timestamp_isSet = true; } diff --git a/swagger/sdrangel/code/qt5/client/SWGLimeSdrOutputReport.h b/swagger/sdrangel/code/qt5/client/SWGLimeSdrOutputReport.h index b068d3aee..3c0b88f40 100644 --- a/swagger/sdrangel/code/qt5/client/SWGLimeSdrOutputReport.h +++ b/swagger/sdrangel/code/qt5/client/SWGLimeSdrOutputReport.h @@ -65,8 +65,8 @@ public: float getLinkRate(); void setLinkRate(float link_rate); - qint32 getHwTimestamp(); - void setHwTimestamp(qint32 hw_timestamp); + qint64 getHwTimestamp(); + void setHwTimestamp(qint64 hw_timestamp); float getTemperature(); void setTemperature(float temperature); @@ -105,7 +105,7 @@ private: float link_rate; bool m_link_rate_isSet; - qint32 hw_timestamp; + qint64 hw_timestamp; bool m_hw_timestamp_isSet; float temperature; diff --git a/swagger/sdrangel/code/qt5/client/SWGLocalInputReport.cpp b/swagger/sdrangel/code/qt5/client/SWGLocalInputReport.cpp index 2e41c9a57..967abb9da 100644 --- a/swagger/sdrangel/code/qt5/client/SWGLocalInputReport.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGLocalInputReport.cpp @@ -28,7 +28,7 @@ SWGLocalInputReport::SWGLocalInputReport(QString* json) { } SWGLocalInputReport::SWGLocalInputReport() { - center_frequency = 0; + center_frequency = 0L; m_center_frequency_isSet = false; sample_rate = 0; m_sample_rate_isSet = false; @@ -40,7 +40,7 @@ SWGLocalInputReport::~SWGLocalInputReport() { void SWGLocalInputReport::init() { - center_frequency = 0; + center_frequency = 0L; m_center_frequency_isSet = false; sample_rate = 0; m_sample_rate_isSet = false; @@ -63,7 +63,7 @@ SWGLocalInputReport::fromJson(QString &json) { void SWGLocalInputReport::fromJsonObject(QJsonObject &pJson) { - ::SWGSDRangel::setValue(¢er_frequency, pJson["centerFrequency"], "qint32", ""); + ::SWGSDRangel::setValue(¢er_frequency, pJson["centerFrequency"], "qint64", ""); ::SWGSDRangel::setValue(&sample_rate, pJson["sampleRate"], "qint32", ""); @@ -93,12 +93,12 @@ SWGLocalInputReport::asJsonObject() { return obj; } -qint32 +qint64 SWGLocalInputReport::getCenterFrequency() { return center_frequency; } void -SWGLocalInputReport::setCenterFrequency(qint32 center_frequency) { +SWGLocalInputReport::setCenterFrequency(qint64 center_frequency) { this->center_frequency = center_frequency; this->m_center_frequency_isSet = true; } diff --git a/swagger/sdrangel/code/qt5/client/SWGLocalInputReport.h b/swagger/sdrangel/code/qt5/client/SWGLocalInputReport.h index ee65f3795..65b73cc60 100644 --- a/swagger/sdrangel/code/qt5/client/SWGLocalInputReport.h +++ b/swagger/sdrangel/code/qt5/client/SWGLocalInputReport.h @@ -41,8 +41,8 @@ public: virtual void fromJsonObject(QJsonObject &json) override; virtual SWGLocalInputReport* fromJson(QString &jsonString) override; - qint32 getCenterFrequency(); - void setCenterFrequency(qint32 center_frequency); + qint64 getCenterFrequency(); + void setCenterFrequency(qint64 center_frequency); qint32 getSampleRate(); void setSampleRate(qint32 sample_rate); @@ -51,7 +51,7 @@ public: virtual bool isSet() override; private: - qint32 center_frequency; + qint64 center_frequency; bool m_center_frequency_isSet; qint32 sample_rate; diff --git a/swagger/sdrangel/code/qt5/client/SWGLocalOutputReport.cpp b/swagger/sdrangel/code/qt5/client/SWGLocalOutputReport.cpp index 2f615e91e..36052965b 100644 --- a/swagger/sdrangel/code/qt5/client/SWGLocalOutputReport.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGLocalOutputReport.cpp @@ -28,7 +28,7 @@ SWGLocalOutputReport::SWGLocalOutputReport(QString* json) { } SWGLocalOutputReport::SWGLocalOutputReport() { - center_frequency = 0; + center_frequency = 0L; m_center_frequency_isSet = false; sample_rate = 0; m_sample_rate_isSet = false; @@ -40,7 +40,7 @@ SWGLocalOutputReport::~SWGLocalOutputReport() { void SWGLocalOutputReport::init() { - center_frequency = 0; + center_frequency = 0L; m_center_frequency_isSet = false; sample_rate = 0; m_sample_rate_isSet = false; @@ -63,7 +63,7 @@ SWGLocalOutputReport::fromJson(QString &json) { void SWGLocalOutputReport::fromJsonObject(QJsonObject &pJson) { - ::SWGSDRangel::setValue(¢er_frequency, pJson["centerFrequency"], "qint32", ""); + ::SWGSDRangel::setValue(¢er_frequency, pJson["centerFrequency"], "qint64", ""); ::SWGSDRangel::setValue(&sample_rate, pJson["sampleRate"], "qint32", ""); @@ -93,12 +93,12 @@ SWGLocalOutputReport::asJsonObject() { return obj; } -qint32 +qint64 SWGLocalOutputReport::getCenterFrequency() { return center_frequency; } void -SWGLocalOutputReport::setCenterFrequency(qint32 center_frequency) { +SWGLocalOutputReport::setCenterFrequency(qint64 center_frequency) { this->center_frequency = center_frequency; this->m_center_frequency_isSet = true; } diff --git a/swagger/sdrangel/code/qt5/client/SWGLocalOutputReport.h b/swagger/sdrangel/code/qt5/client/SWGLocalOutputReport.h index 74839fa24..2b307c19f 100644 --- a/swagger/sdrangel/code/qt5/client/SWGLocalOutputReport.h +++ b/swagger/sdrangel/code/qt5/client/SWGLocalOutputReport.h @@ -41,8 +41,8 @@ public: virtual void fromJsonObject(QJsonObject &json) override; virtual SWGLocalOutputReport* fromJson(QString &jsonString) override; - qint32 getCenterFrequency(); - void setCenterFrequency(qint32 center_frequency); + qint64 getCenterFrequency(); + void setCenterFrequency(qint64 center_frequency); qint32 getSampleRate(); void setSampleRate(qint32 sample_rate); @@ -51,7 +51,7 @@ public: virtual bool isSet() override; private: - qint32 center_frequency; + qint64 center_frequency; bool m_center_frequency_isSet; qint32 sample_rate; diff --git a/swagger/sdrangel/code/qt5/client/SWGRemoteInputReport.cpp b/swagger/sdrangel/code/qt5/client/SWGRemoteInputReport.cpp index 24bf08534..1e17de2fe 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRemoteInputReport.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGRemoteInputReport.cpp @@ -28,7 +28,7 @@ SWGRemoteInputReport::SWGRemoteInputReport(QString* json) { } SWGRemoteInputReport::SWGRemoteInputReport() { - center_frequency = 0; + center_frequency = 0L; m_center_frequency_isSet = false; sample_rate = 0; m_sample_rate_isSet = false; @@ -48,7 +48,7 @@ SWGRemoteInputReport::~SWGRemoteInputReport() { void SWGRemoteInputReport::init() { - center_frequency = 0; + center_frequency = 0L; m_center_frequency_isSet = false; sample_rate = 0; m_sample_rate_isSet = false; @@ -85,7 +85,7 @@ SWGRemoteInputReport::fromJson(QString &json) { void SWGRemoteInputReport::fromJsonObject(QJsonObject &pJson) { - ::SWGSDRangel::setValue(¢er_frequency, pJson["centerFrequency"], "qint32", ""); + ::SWGSDRangel::setValue(¢er_frequency, pJson["centerFrequency"], "qint64", ""); ::SWGSDRangel::setValue(&sample_rate, pJson["sampleRate"], "qint32", ""); @@ -135,12 +135,12 @@ SWGRemoteInputReport::asJsonObject() { return obj; } -qint32 +qint64 SWGRemoteInputReport::getCenterFrequency() { return center_frequency; } void -SWGRemoteInputReport::setCenterFrequency(qint32 center_frequency) { +SWGRemoteInputReport::setCenterFrequency(qint64 center_frequency) { this->center_frequency = center_frequency; this->m_center_frequency_isSet = true; } diff --git a/swagger/sdrangel/code/qt5/client/SWGRemoteInputReport.h b/swagger/sdrangel/code/qt5/client/SWGRemoteInputReport.h index cb440e680..237879ccf 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRemoteInputReport.h +++ b/swagger/sdrangel/code/qt5/client/SWGRemoteInputReport.h @@ -42,8 +42,8 @@ public: virtual void fromJsonObject(QJsonObject &json) override; virtual SWGRemoteInputReport* fromJson(QString &jsonString) override; - qint32 getCenterFrequency(); - void setCenterFrequency(qint32 center_frequency); + qint64 getCenterFrequency(); + void setCenterFrequency(qint64 center_frequency); qint32 getSampleRate(); void setSampleRate(qint32 sample_rate); @@ -64,7 +64,7 @@ public: virtual bool isSet() override; private: - qint32 center_frequency; + qint64 center_frequency; bool m_center_frequency_isSet; qint32 sample_rate; diff --git a/swagger/sdrangel/code/qt5/client/SWGRemoteOutputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGRemoteOutputSettings.cpp index cc86a051f..f869ed743 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRemoteOutputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGRemoteOutputSettings.cpp @@ -28,7 +28,7 @@ SWGRemoteOutputSettings::SWGRemoteOutputSettings(QString* json) { } SWGRemoteOutputSettings::SWGRemoteOutputSettings() { - center_frequency = 0; + center_frequency = 0L; m_center_frequency_isSet = false; sample_rate = 0; m_sample_rate_isSet = false; @@ -64,7 +64,7 @@ SWGRemoteOutputSettings::~SWGRemoteOutputSettings() { void SWGRemoteOutputSettings::init() { - center_frequency = 0; + center_frequency = 0L; m_center_frequency_isSet = false; sample_rate = 0; m_sample_rate_isSet = false; @@ -129,7 +129,7 @@ SWGRemoteOutputSettings::fromJson(QString &json) { void SWGRemoteOutputSettings::fromJsonObject(QJsonObject &pJson) { - ::SWGSDRangel::setValue(¢er_frequency, pJson["centerFrequency"], "qint32", ""); + ::SWGSDRangel::setValue(¢er_frequency, pJson["centerFrequency"], "qint64", ""); ::SWGSDRangel::setValue(&sample_rate, pJson["sampleRate"], "qint32", ""); @@ -219,12 +219,12 @@ SWGRemoteOutputSettings::asJsonObject() { return obj; } -qint32 +qint64 SWGRemoteOutputSettings::getCenterFrequency() { return center_frequency; } void -SWGRemoteOutputSettings::setCenterFrequency(qint32 center_frequency) { +SWGRemoteOutputSettings::setCenterFrequency(qint64 center_frequency) { this->center_frequency = center_frequency; this->m_center_frequency_isSet = true; } diff --git a/swagger/sdrangel/code/qt5/client/SWGRemoteOutputSettings.h b/swagger/sdrangel/code/qt5/client/SWGRemoteOutputSettings.h index ff9addbf4..37833859c 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRemoteOutputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGRemoteOutputSettings.h @@ -42,8 +42,8 @@ public: virtual void fromJsonObject(QJsonObject &json) override; virtual SWGRemoteOutputSettings* fromJson(QString &jsonString) override; - qint32 getCenterFrequency(); - void setCenterFrequency(qint32 center_frequency); + qint64 getCenterFrequency(); + void setCenterFrequency(qint64 center_frequency); qint32 getSampleRate(); void setSampleRate(qint32 sample_rate); @@ -88,7 +88,7 @@ public: virtual bool isSet() override; private: - qint32 center_frequency; + qint64 center_frequency; bool m_center_frequency_isSet; qint32 sample_rate; diff --git a/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.cpp index 62720de2e..360595922 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.cpp @@ -28,7 +28,7 @@ SWGSDRPlaySettings::SWGSDRPlaySettings(QString* json) { } SWGSDRPlaySettings::SWGSDRPlaySettings() { - center_frequency = 0; + center_frequency = 0L; m_center_frequency_isSet = false; tuner_gain = 0; m_tuner_gain_isSet = false; @@ -76,7 +76,7 @@ SWGSDRPlaySettings::~SWGSDRPlaySettings() { void SWGSDRPlaySettings::init() { - center_frequency = 0; + center_frequency = 0L; m_center_frequency_isSet = false; tuner_gain = 0; m_tuner_gain_isSet = false; @@ -155,7 +155,7 @@ SWGSDRPlaySettings::fromJson(QString &json) { void SWGSDRPlaySettings::fromJsonObject(QJsonObject &pJson) { - ::SWGSDRangel::setValue(¢er_frequency, pJson["centerFrequency"], "qint32", ""); + ::SWGSDRangel::setValue(¢er_frequency, pJson["centerFrequency"], "qint64", ""); ::SWGSDRangel::setValue(&tuner_gain, pJson["tunerGain"], "qint32", ""); @@ -275,12 +275,12 @@ SWGSDRPlaySettings::asJsonObject() { return obj; } -qint32 +qint64 SWGSDRPlaySettings::getCenterFrequency() { return center_frequency; } void -SWGSDRPlaySettings::setCenterFrequency(qint32 center_frequency) { +SWGSDRPlaySettings::setCenterFrequency(qint64 center_frequency) { this->center_frequency = center_frequency; this->m_center_frequency_isSet = true; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.h b/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.h index b8791870e..7973273b5 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.h @@ -42,8 +42,8 @@ public: virtual void fromJsonObject(QJsonObject &json) override; virtual SWGSDRPlaySettings* fromJson(QString &jsonString) override; - qint32 getCenterFrequency(); - void setCenterFrequency(qint32 center_frequency); + qint64 getCenterFrequency(); + void setCenterFrequency(qint64 center_frequency); qint32 getTunerGain(); void setTunerGain(qint32 tuner_gain); @@ -106,7 +106,7 @@ public: virtual bool isSet() override; private: - qint32 center_frequency; + qint64 center_frequency; bool m_center_frequency_isSet; qint32 tuner_gain; diff --git a/swagger/sdrangel/code/qt5/client/SWGTestSourceSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGTestSourceSettings.cpp index 83703624b..6831ee5a2 100644 --- a/swagger/sdrangel/code/qt5/client/SWGTestSourceSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGTestSourceSettings.cpp @@ -28,7 +28,7 @@ SWGTestSourceSettings::SWGTestSourceSettings(QString* json) { } SWGTestSourceSettings::SWGTestSourceSettings() { - center_frequency = 0; + center_frequency = 0L; m_center_frequency_isSet = false; frequency_shift = 0; m_frequency_shift_isSet = false; @@ -76,7 +76,7 @@ SWGTestSourceSettings::~SWGTestSourceSettings() { void SWGTestSourceSettings::init() { - center_frequency = 0; + center_frequency = 0L; m_center_frequency_isSet = false; frequency_shift = 0; m_frequency_shift_isSet = false; @@ -155,7 +155,7 @@ SWGTestSourceSettings::fromJson(QString &json) { void SWGTestSourceSettings::fromJsonObject(QJsonObject &pJson) { - ::SWGSDRangel::setValue(¢er_frequency, pJson["centerFrequency"], "qint32", ""); + ::SWGSDRangel::setValue(¢er_frequency, pJson["centerFrequency"], "qint64", ""); ::SWGSDRangel::setValue(&frequency_shift, pJson["frequencyShift"], "qint32", ""); @@ -275,12 +275,12 @@ SWGTestSourceSettings::asJsonObject() { return obj; } -qint32 +qint64 SWGTestSourceSettings::getCenterFrequency() { return center_frequency; } void -SWGTestSourceSettings::setCenterFrequency(qint32 center_frequency) { +SWGTestSourceSettings::setCenterFrequency(qint64 center_frequency) { this->center_frequency = center_frequency; this->m_center_frequency_isSet = true; } diff --git a/swagger/sdrangel/code/qt5/client/SWGTestSourceSettings.h b/swagger/sdrangel/code/qt5/client/SWGTestSourceSettings.h index e1e380831..f581d3587 100644 --- a/swagger/sdrangel/code/qt5/client/SWGTestSourceSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGTestSourceSettings.h @@ -42,8 +42,8 @@ public: virtual void fromJsonObject(QJsonObject &json) override; virtual SWGTestSourceSettings* fromJson(QString &jsonString) override; - qint32 getCenterFrequency(); - void setCenterFrequency(qint32 center_frequency); + qint64 getCenterFrequency(); + void setCenterFrequency(qint64 center_frequency); qint32 getFrequencyShift(); void setFrequencyShift(qint32 frequency_shift); @@ -106,7 +106,7 @@ public: virtual bool isSet() override; private: - qint32 center_frequency; + qint64 center_frequency; bool m_center_frequency_isSet; qint32 frequency_shift;