1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-02 13:17:48 -04:00

REST API: chanded uint64 to int64 integer formats. Fixes #624

This commit is contained in:
f4exb 2020-09-10 15:23:18 +02:00
parent d9ec9f2787
commit 308b870063
34 changed files with 100 additions and 100 deletions

View File

@ -4236,7 +4236,7 @@ margin-bottom: 20px;
}, },
"hwTimestamp" : { "hwTimestamp" : {
"type" : "integer", "type" : "integer",
"format" : "uint64", "format" : "int64",
"description" : "Hardware timestamp" "description" : "Hardware timestamp"
}, },
"temperature" : { "temperature" : {
@ -4380,7 +4380,7 @@ margin-bottom: 20px;
}, },
"hwTimestamp" : { "hwTimestamp" : {
"type" : "integer", "type" : "integer",
"format" : "uint64", "format" : "int64",
"description" : "Hardware timestamp" "description" : "Hardware timestamp"
}, },
"temperature" : { "temperature" : {
@ -4475,7 +4475,7 @@ margin-bottom: 20px;
"properties" : { "properties" : {
"centerFrequency" : { "centerFrequency" : {
"type" : "integer", "type" : "integer",
"format" : "uint64" "format" : "int64"
}, },
"sampleRate" : { "sampleRate" : {
"type" : "integer" "type" : "integer"
@ -4511,7 +4511,7 @@ margin-bottom: 20px;
"properties" : { "properties" : {
"centerFrequency" : { "centerFrequency" : {
"type" : "integer", "type" : "integer",
"format" : "uint64" "format" : "int64"
}, },
"sampleRate" : { "sampleRate" : {
"type" : "integer" "type" : "integer"
@ -5443,7 +5443,7 @@ margin-bottom: 20px;
"properties" : { "properties" : {
"centerFrequency" : { "centerFrequency" : {
"type" : "integer", "type" : "integer",
"format" : "uint64" "format" : "int64"
}, },
"sampleRate" : { "sampleRate" : {
"type" : "integer" "type" : "integer"
@ -5528,7 +5528,7 @@ margin-bottom: 20px;
"properties" : { "properties" : {
"centerFrequency" : { "centerFrequency" : {
"type" : "integer", "type" : "integer",
"format" : "uint64" "format" : "int64"
}, },
"sampleRate" : { "sampleRate" : {
"type" : "integer" "type" : "integer"
@ -5841,7 +5841,7 @@ margin-bottom: 20px;
"properties" : { "properties" : {
"centerFrequency" : { "centerFrequency" : {
"type" : "integer", "type" : "integer",
"format" : "uint64" "format" : "int64"
}, },
"tunerGain" : { "tunerGain" : {
"type" : "integer" "type" : "integer"
@ -6486,7 +6486,7 @@ margin-bottom: 20px;
"properties" : { "properties" : {
"centerFrequency" : { "centerFrequency" : {
"type" : "integer", "type" : "integer",
"format" : "uint64" "format" : "int64"
}, },
"frequencyShift" : { "frequencyShift" : {
"type" : "integer" "type" : "integer"
@ -33319,7 +33319,7 @@ except ApiException as e:
</div> </div>
<div id="generator"> <div id="generator">
<div class="content"> <div class="content">
Generated 2020-08-27T07:43:19.609+02:00 Generated 2020-09-10T15:07:12.501+02:00
</div> </div>
</div> </div>
</div> </div>

View File

@ -143,7 +143,7 @@ LimeSdrInputReport:
hwTimestamp: hwTimestamp:
description: Hardware timestamp description: Hardware timestamp
type: integer type: integer
format: uint64 format: int64
temperature: temperature:
type: number type: number
format: float format: float
@ -179,7 +179,7 @@ LimeSdrOutputReport:
hwTimestamp: hwTimestamp:
description: Hardware timestamp description: Hardware timestamp
type: integer type: integer
format: uint64 format: int64
temperature: temperature:
type: number type: number
format: float format: float

View File

@ -20,6 +20,6 @@ LocalInputReport:
properties: properties:
centerFrequency: centerFrequency:
type: integer type: integer
format: uint64 format: int64
sampleRate: sampleRate:
type: integer type: integer

View File

@ -16,6 +16,6 @@ LocalOutputReport:
properties: properties:
centerFrequency: centerFrequency:
type: integer type: integer
format: uint64 format: int64
sampleRate: sampleRate:
type: integer type: integer

View File

@ -36,7 +36,7 @@ RemoteInputReport:
properties: properties:
centerFrequency: centerFrequency:
type: integer type: integer
format: uint64 format: int64
sampleRate: sampleRate:
type: integer type: integer
bufferRWBalance: bufferRWBalance:

View File

@ -3,7 +3,7 @@ RemoteOutputSettings:
properties: properties:
centerFrequency: centerFrequency:
type: integer type: integer
format: uint64 format: int64
sampleRate: sampleRate:
type: integer type: integer
txDelay: txDelay:

View File

@ -3,7 +3,7 @@ SDRPlaySettings:
properties: properties:
centerFrequency: centerFrequency:
type: integer type: integer
format: uint64 format: int64
tunerGain: tunerGain:
type: integer type: integer
LOppmTenths: LOppmTenths:

View File

@ -27,7 +27,7 @@ definitions:
type: integer type: integer
centerFrequency: centerFrequency:
type: integer type: integer
format: uint64 format: int64
frequencyShift: frequencyShift:
type: integer type: integer
sampleRate: sampleRate:

View File

@ -3,7 +3,7 @@ TestSourceSettings:
properties: properties:
centerFrequency: centerFrequency:
type: integer type: integer
format: uint64 format: int64
frequencyShift: frequencyShift:
type: integer type: integer
sampleRate: sampleRate:

View File

@ -3,7 +3,7 @@ TestSourceMISettings:
properties: properties:
centerFrequency: centerFrequency:
type: integer type: integer
format: uint64 format: int64
frequencyShift: frequencyShift:
type: integer type: integer
sampleRate: sampleRate:

View File

@ -143,7 +143,7 @@ LimeSdrInputReport:
hwTimestamp: hwTimestamp:
description: Hardware timestamp description: Hardware timestamp
type: integer type: integer
format: uint64 format: int64
temperature: temperature:
type: number type: number
format: float format: float
@ -179,7 +179,7 @@ LimeSdrOutputReport:
hwTimestamp: hwTimestamp:
description: Hardware timestamp description: Hardware timestamp
type: integer type: integer
format: uint64 format: int64
temperature: temperature:
type: number type: number
format: float format: float

View File

@ -20,6 +20,6 @@ LocalInputReport:
properties: properties:
centerFrequency: centerFrequency:
type: integer type: integer
format: uint64 format: int64
sampleRate: sampleRate:
type: integer type: integer

View File

@ -16,6 +16,6 @@ LocalOutputReport:
properties: properties:
centerFrequency: centerFrequency:
type: integer type: integer
format: uint64 format: int64
sampleRate: sampleRate:
type: integer type: integer

View File

@ -36,7 +36,7 @@ RemoteInputReport:
properties: properties:
centerFrequency: centerFrequency:
type: integer type: integer
format: uint64 format: int64
sampleRate: sampleRate:
type: integer type: integer
bufferRWBalance: bufferRWBalance:

View File

@ -3,7 +3,7 @@ RemoteOutputSettings:
properties: properties:
centerFrequency: centerFrequency:
type: integer type: integer
format: uint64 format: int64
sampleRate: sampleRate:
type: integer type: integer
txDelay: txDelay:

View File

@ -3,7 +3,7 @@ SDRPlaySettings:
properties: properties:
centerFrequency: centerFrequency:
type: integer type: integer
format: uint64 format: int64
tunerGain: tunerGain:
type: integer type: integer
LOppmTenths: LOppmTenths:

View File

@ -3,7 +3,7 @@ TestSourceSettings:
properties: properties:
centerFrequency: centerFrequency:
type: integer type: integer
format: uint64 format: int64
frequencyShift: frequencyShift:
type: integer type: integer
sampleRate: sampleRate:

View File

@ -4236,7 +4236,7 @@ margin-bottom: 20px;
}, },
"hwTimestamp" : { "hwTimestamp" : {
"type" : "integer", "type" : "integer",
"format" : "uint64", "format" : "int64",
"description" : "Hardware timestamp" "description" : "Hardware timestamp"
}, },
"temperature" : { "temperature" : {
@ -4380,7 +4380,7 @@ margin-bottom: 20px;
}, },
"hwTimestamp" : { "hwTimestamp" : {
"type" : "integer", "type" : "integer",
"format" : "uint64", "format" : "int64",
"description" : "Hardware timestamp" "description" : "Hardware timestamp"
}, },
"temperature" : { "temperature" : {
@ -4475,7 +4475,7 @@ margin-bottom: 20px;
"properties" : { "properties" : {
"centerFrequency" : { "centerFrequency" : {
"type" : "integer", "type" : "integer",
"format" : "uint64" "format" : "int64"
}, },
"sampleRate" : { "sampleRate" : {
"type" : "integer" "type" : "integer"
@ -4511,7 +4511,7 @@ margin-bottom: 20px;
"properties" : { "properties" : {
"centerFrequency" : { "centerFrequency" : {
"type" : "integer", "type" : "integer",
"format" : "uint64" "format" : "int64"
}, },
"sampleRate" : { "sampleRate" : {
"type" : "integer" "type" : "integer"
@ -5443,7 +5443,7 @@ margin-bottom: 20px;
"properties" : { "properties" : {
"centerFrequency" : { "centerFrequency" : {
"type" : "integer", "type" : "integer",
"format" : "uint64" "format" : "int64"
}, },
"sampleRate" : { "sampleRate" : {
"type" : "integer" "type" : "integer"
@ -5528,7 +5528,7 @@ margin-bottom: 20px;
"properties" : { "properties" : {
"centerFrequency" : { "centerFrequency" : {
"type" : "integer", "type" : "integer",
"format" : "uint64" "format" : "int64"
}, },
"sampleRate" : { "sampleRate" : {
"type" : "integer" "type" : "integer"
@ -5841,7 +5841,7 @@ margin-bottom: 20px;
"properties" : { "properties" : {
"centerFrequency" : { "centerFrequency" : {
"type" : "integer", "type" : "integer",
"format" : "uint64" "format" : "int64"
}, },
"tunerGain" : { "tunerGain" : {
"type" : "integer" "type" : "integer"
@ -6486,7 +6486,7 @@ margin-bottom: 20px;
"properties" : { "properties" : {
"centerFrequency" : { "centerFrequency" : {
"type" : "integer", "type" : "integer",
"format" : "uint64" "format" : "int64"
}, },
"frequencyShift" : { "frequencyShift" : {
"type" : "integer" "type" : "integer"
@ -33319,7 +33319,7 @@ except ApiException as e:
</div> </div>
<div id="generator"> <div id="generator">
<div class="content"> <div class="content">
Generated 2020-08-27T07:43:19.609+02:00 Generated 2020-09-10T15:07:12.501+02:00
</div> </div>
</div> </div>
</div> </div>

View File

@ -44,7 +44,7 @@ SWGLimeSdrInputReport::SWGLimeSdrInputReport() {
m_dropped_packets_count_isSet = false; m_dropped_packets_count_isSet = false;
link_rate = 0.0f; link_rate = 0.0f;
m_link_rate_isSet = false; m_link_rate_isSet = false;
hw_timestamp = 0; hw_timestamp = 0L;
m_hw_timestamp_isSet = false; m_hw_timestamp_isSet = false;
temperature = 0.0f; temperature = 0.0f;
m_temperature_isSet = false; m_temperature_isSet = false;
@ -76,7 +76,7 @@ SWGLimeSdrInputReport::init() {
m_dropped_packets_count_isSet = false; m_dropped_packets_count_isSet = false;
link_rate = 0.0f; link_rate = 0.0f;
m_link_rate_isSet = false; m_link_rate_isSet = false;
hw_timestamp = 0; hw_timestamp = 0L;
m_hw_timestamp_isSet = false; m_hw_timestamp_isSet = false;
temperature = 0.0f; temperature = 0.0f;
m_temperature_isSet = false; m_temperature_isSet = false;
@ -129,7 +129,7 @@ SWGLimeSdrInputReport::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&link_rate, pJson["linkRate"], "float", ""); ::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", ""); ::SWGSDRangel::setValue(&temperature, pJson["temperature"], "float", "");
@ -273,12 +273,12 @@ SWGLimeSdrInputReport::setLinkRate(float link_rate) {
this->m_link_rate_isSet = true; this->m_link_rate_isSet = true;
} }
qint32 qint64
SWGLimeSdrInputReport::getHwTimestamp() { SWGLimeSdrInputReport::getHwTimestamp() {
return hw_timestamp; return hw_timestamp;
} }
void void
SWGLimeSdrInputReport::setHwTimestamp(qint32 hw_timestamp) { SWGLimeSdrInputReport::setHwTimestamp(qint64 hw_timestamp) {
this->hw_timestamp = hw_timestamp; this->hw_timestamp = hw_timestamp;
this->m_hw_timestamp_isSet = true; this->m_hw_timestamp_isSet = true;
} }

View File

@ -65,8 +65,8 @@ public:
float getLinkRate(); float getLinkRate();
void setLinkRate(float link_rate); void setLinkRate(float link_rate);
qint32 getHwTimestamp(); qint64 getHwTimestamp();
void setHwTimestamp(qint32 hw_timestamp); void setHwTimestamp(qint64 hw_timestamp);
float getTemperature(); float getTemperature();
void setTemperature(float temperature); void setTemperature(float temperature);
@ -105,7 +105,7 @@ private:
float link_rate; float link_rate;
bool m_link_rate_isSet; bool m_link_rate_isSet;
qint32 hw_timestamp; qint64 hw_timestamp;
bool m_hw_timestamp_isSet; bool m_hw_timestamp_isSet;
float temperature; float temperature;

View File

@ -44,7 +44,7 @@ SWGLimeSdrOutputReport::SWGLimeSdrOutputReport() {
m_dropped_packets_count_isSet = false; m_dropped_packets_count_isSet = false;
link_rate = 0.0f; link_rate = 0.0f;
m_link_rate_isSet = false; m_link_rate_isSet = false;
hw_timestamp = 0; hw_timestamp = 0L;
m_hw_timestamp_isSet = false; m_hw_timestamp_isSet = false;
temperature = 0.0f; temperature = 0.0f;
m_temperature_isSet = false; m_temperature_isSet = false;
@ -76,7 +76,7 @@ SWGLimeSdrOutputReport::init() {
m_dropped_packets_count_isSet = false; m_dropped_packets_count_isSet = false;
link_rate = 0.0f; link_rate = 0.0f;
m_link_rate_isSet = false; m_link_rate_isSet = false;
hw_timestamp = 0; hw_timestamp = 0L;
m_hw_timestamp_isSet = false; m_hw_timestamp_isSet = false;
temperature = 0.0f; temperature = 0.0f;
m_temperature_isSet = false; m_temperature_isSet = false;
@ -129,7 +129,7 @@ SWGLimeSdrOutputReport::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&link_rate, pJson["linkRate"], "float", ""); ::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", ""); ::SWGSDRangel::setValue(&temperature, pJson["temperature"], "float", "");
@ -273,12 +273,12 @@ SWGLimeSdrOutputReport::setLinkRate(float link_rate) {
this->m_link_rate_isSet = true; this->m_link_rate_isSet = true;
} }
qint32 qint64
SWGLimeSdrOutputReport::getHwTimestamp() { SWGLimeSdrOutputReport::getHwTimestamp() {
return hw_timestamp; return hw_timestamp;
} }
void void
SWGLimeSdrOutputReport::setHwTimestamp(qint32 hw_timestamp) { SWGLimeSdrOutputReport::setHwTimestamp(qint64 hw_timestamp) {
this->hw_timestamp = hw_timestamp; this->hw_timestamp = hw_timestamp;
this->m_hw_timestamp_isSet = true; this->m_hw_timestamp_isSet = true;
} }

View File

@ -65,8 +65,8 @@ public:
float getLinkRate(); float getLinkRate();
void setLinkRate(float link_rate); void setLinkRate(float link_rate);
qint32 getHwTimestamp(); qint64 getHwTimestamp();
void setHwTimestamp(qint32 hw_timestamp); void setHwTimestamp(qint64 hw_timestamp);
float getTemperature(); float getTemperature();
void setTemperature(float temperature); void setTemperature(float temperature);
@ -105,7 +105,7 @@ private:
float link_rate; float link_rate;
bool m_link_rate_isSet; bool m_link_rate_isSet;
qint32 hw_timestamp; qint64 hw_timestamp;
bool m_hw_timestamp_isSet; bool m_hw_timestamp_isSet;
float temperature; float temperature;

View File

@ -28,7 +28,7 @@ SWGLocalInputReport::SWGLocalInputReport(QString* json) {
} }
SWGLocalInputReport::SWGLocalInputReport() { SWGLocalInputReport::SWGLocalInputReport() {
center_frequency = 0; center_frequency = 0L;
m_center_frequency_isSet = false; m_center_frequency_isSet = false;
sample_rate = 0; sample_rate = 0;
m_sample_rate_isSet = false; m_sample_rate_isSet = false;
@ -40,7 +40,7 @@ SWGLocalInputReport::~SWGLocalInputReport() {
void void
SWGLocalInputReport::init() { SWGLocalInputReport::init() {
center_frequency = 0; center_frequency = 0L;
m_center_frequency_isSet = false; m_center_frequency_isSet = false;
sample_rate = 0; sample_rate = 0;
m_sample_rate_isSet = false; m_sample_rate_isSet = false;
@ -63,7 +63,7 @@ SWGLocalInputReport::fromJson(QString &json) {
void void
SWGLocalInputReport::fromJsonObject(QJsonObject &pJson) { SWGLocalInputReport::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&center_frequency, pJson["centerFrequency"], "qint32", ""); ::SWGSDRangel::setValue(&center_frequency, pJson["centerFrequency"], "qint64", "");
::SWGSDRangel::setValue(&sample_rate, pJson["sampleRate"], "qint32", ""); ::SWGSDRangel::setValue(&sample_rate, pJson["sampleRate"], "qint32", "");
@ -93,12 +93,12 @@ SWGLocalInputReport::asJsonObject() {
return obj; return obj;
} }
qint32 qint64
SWGLocalInputReport::getCenterFrequency() { SWGLocalInputReport::getCenterFrequency() {
return center_frequency; return center_frequency;
} }
void void
SWGLocalInputReport::setCenterFrequency(qint32 center_frequency) { SWGLocalInputReport::setCenterFrequency(qint64 center_frequency) {
this->center_frequency = center_frequency; this->center_frequency = center_frequency;
this->m_center_frequency_isSet = true; this->m_center_frequency_isSet = true;
} }

View File

@ -41,8 +41,8 @@ public:
virtual void fromJsonObject(QJsonObject &json) override; virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGLocalInputReport* fromJson(QString &jsonString) override; virtual SWGLocalInputReport* fromJson(QString &jsonString) override;
qint32 getCenterFrequency(); qint64 getCenterFrequency();
void setCenterFrequency(qint32 center_frequency); void setCenterFrequency(qint64 center_frequency);
qint32 getSampleRate(); qint32 getSampleRate();
void setSampleRate(qint32 sample_rate); void setSampleRate(qint32 sample_rate);
@ -51,7 +51,7 @@ public:
virtual bool isSet() override; virtual bool isSet() override;
private: private:
qint32 center_frequency; qint64 center_frequency;
bool m_center_frequency_isSet; bool m_center_frequency_isSet;
qint32 sample_rate; qint32 sample_rate;

View File

@ -28,7 +28,7 @@ SWGLocalOutputReport::SWGLocalOutputReport(QString* json) {
} }
SWGLocalOutputReport::SWGLocalOutputReport() { SWGLocalOutputReport::SWGLocalOutputReport() {
center_frequency = 0; center_frequency = 0L;
m_center_frequency_isSet = false; m_center_frequency_isSet = false;
sample_rate = 0; sample_rate = 0;
m_sample_rate_isSet = false; m_sample_rate_isSet = false;
@ -40,7 +40,7 @@ SWGLocalOutputReport::~SWGLocalOutputReport() {
void void
SWGLocalOutputReport::init() { SWGLocalOutputReport::init() {
center_frequency = 0; center_frequency = 0L;
m_center_frequency_isSet = false; m_center_frequency_isSet = false;
sample_rate = 0; sample_rate = 0;
m_sample_rate_isSet = false; m_sample_rate_isSet = false;
@ -63,7 +63,7 @@ SWGLocalOutputReport::fromJson(QString &json) {
void void
SWGLocalOutputReport::fromJsonObject(QJsonObject &pJson) { SWGLocalOutputReport::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&center_frequency, pJson["centerFrequency"], "qint32", ""); ::SWGSDRangel::setValue(&center_frequency, pJson["centerFrequency"], "qint64", "");
::SWGSDRangel::setValue(&sample_rate, pJson["sampleRate"], "qint32", ""); ::SWGSDRangel::setValue(&sample_rate, pJson["sampleRate"], "qint32", "");
@ -93,12 +93,12 @@ SWGLocalOutputReport::asJsonObject() {
return obj; return obj;
} }
qint32 qint64
SWGLocalOutputReport::getCenterFrequency() { SWGLocalOutputReport::getCenterFrequency() {
return center_frequency; return center_frequency;
} }
void void
SWGLocalOutputReport::setCenterFrequency(qint32 center_frequency) { SWGLocalOutputReport::setCenterFrequency(qint64 center_frequency) {
this->center_frequency = center_frequency; this->center_frequency = center_frequency;
this->m_center_frequency_isSet = true; this->m_center_frequency_isSet = true;
} }

View File

@ -41,8 +41,8 @@ public:
virtual void fromJsonObject(QJsonObject &json) override; virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGLocalOutputReport* fromJson(QString &jsonString) override; virtual SWGLocalOutputReport* fromJson(QString &jsonString) override;
qint32 getCenterFrequency(); qint64 getCenterFrequency();
void setCenterFrequency(qint32 center_frequency); void setCenterFrequency(qint64 center_frequency);
qint32 getSampleRate(); qint32 getSampleRate();
void setSampleRate(qint32 sample_rate); void setSampleRate(qint32 sample_rate);
@ -51,7 +51,7 @@ public:
virtual bool isSet() override; virtual bool isSet() override;
private: private:
qint32 center_frequency; qint64 center_frequency;
bool m_center_frequency_isSet; bool m_center_frequency_isSet;
qint32 sample_rate; qint32 sample_rate;

View File

@ -28,7 +28,7 @@ SWGRemoteInputReport::SWGRemoteInputReport(QString* json) {
} }
SWGRemoteInputReport::SWGRemoteInputReport() { SWGRemoteInputReport::SWGRemoteInputReport() {
center_frequency = 0; center_frequency = 0L;
m_center_frequency_isSet = false; m_center_frequency_isSet = false;
sample_rate = 0; sample_rate = 0;
m_sample_rate_isSet = false; m_sample_rate_isSet = false;
@ -48,7 +48,7 @@ SWGRemoteInputReport::~SWGRemoteInputReport() {
void void
SWGRemoteInputReport::init() { SWGRemoteInputReport::init() {
center_frequency = 0; center_frequency = 0L;
m_center_frequency_isSet = false; m_center_frequency_isSet = false;
sample_rate = 0; sample_rate = 0;
m_sample_rate_isSet = false; m_sample_rate_isSet = false;
@ -85,7 +85,7 @@ SWGRemoteInputReport::fromJson(QString &json) {
void void
SWGRemoteInputReport::fromJsonObject(QJsonObject &pJson) { SWGRemoteInputReport::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&center_frequency, pJson["centerFrequency"], "qint32", ""); ::SWGSDRangel::setValue(&center_frequency, pJson["centerFrequency"], "qint64", "");
::SWGSDRangel::setValue(&sample_rate, pJson["sampleRate"], "qint32", ""); ::SWGSDRangel::setValue(&sample_rate, pJson["sampleRate"], "qint32", "");
@ -135,12 +135,12 @@ SWGRemoteInputReport::asJsonObject() {
return obj; return obj;
} }
qint32 qint64
SWGRemoteInputReport::getCenterFrequency() { SWGRemoteInputReport::getCenterFrequency() {
return center_frequency; return center_frequency;
} }
void void
SWGRemoteInputReport::setCenterFrequency(qint32 center_frequency) { SWGRemoteInputReport::setCenterFrequency(qint64 center_frequency) {
this->center_frequency = center_frequency; this->center_frequency = center_frequency;
this->m_center_frequency_isSet = true; this->m_center_frequency_isSet = true;
} }

View File

@ -42,8 +42,8 @@ public:
virtual void fromJsonObject(QJsonObject &json) override; virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGRemoteInputReport* fromJson(QString &jsonString) override; virtual SWGRemoteInputReport* fromJson(QString &jsonString) override;
qint32 getCenterFrequency(); qint64 getCenterFrequency();
void setCenterFrequency(qint32 center_frequency); void setCenterFrequency(qint64 center_frequency);
qint32 getSampleRate(); qint32 getSampleRate();
void setSampleRate(qint32 sample_rate); void setSampleRate(qint32 sample_rate);
@ -64,7 +64,7 @@ public:
virtual bool isSet() override; virtual bool isSet() override;
private: private:
qint32 center_frequency; qint64 center_frequency;
bool m_center_frequency_isSet; bool m_center_frequency_isSet;
qint32 sample_rate; qint32 sample_rate;

View File

@ -28,7 +28,7 @@ SWGRemoteOutputSettings::SWGRemoteOutputSettings(QString* json) {
} }
SWGRemoteOutputSettings::SWGRemoteOutputSettings() { SWGRemoteOutputSettings::SWGRemoteOutputSettings() {
center_frequency = 0; center_frequency = 0L;
m_center_frequency_isSet = false; m_center_frequency_isSet = false;
sample_rate = 0; sample_rate = 0;
m_sample_rate_isSet = false; m_sample_rate_isSet = false;
@ -64,7 +64,7 @@ SWGRemoteOutputSettings::~SWGRemoteOutputSettings() {
void void
SWGRemoteOutputSettings::init() { SWGRemoteOutputSettings::init() {
center_frequency = 0; center_frequency = 0L;
m_center_frequency_isSet = false; m_center_frequency_isSet = false;
sample_rate = 0; sample_rate = 0;
m_sample_rate_isSet = false; m_sample_rate_isSet = false;
@ -129,7 +129,7 @@ SWGRemoteOutputSettings::fromJson(QString &json) {
void void
SWGRemoteOutputSettings::fromJsonObject(QJsonObject &pJson) { SWGRemoteOutputSettings::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&center_frequency, pJson["centerFrequency"], "qint32", ""); ::SWGSDRangel::setValue(&center_frequency, pJson["centerFrequency"], "qint64", "");
::SWGSDRangel::setValue(&sample_rate, pJson["sampleRate"], "qint32", ""); ::SWGSDRangel::setValue(&sample_rate, pJson["sampleRate"], "qint32", "");
@ -219,12 +219,12 @@ SWGRemoteOutputSettings::asJsonObject() {
return obj; return obj;
} }
qint32 qint64
SWGRemoteOutputSettings::getCenterFrequency() { SWGRemoteOutputSettings::getCenterFrequency() {
return center_frequency; return center_frequency;
} }
void void
SWGRemoteOutputSettings::setCenterFrequency(qint32 center_frequency) { SWGRemoteOutputSettings::setCenterFrequency(qint64 center_frequency) {
this->center_frequency = center_frequency; this->center_frequency = center_frequency;
this->m_center_frequency_isSet = true; this->m_center_frequency_isSet = true;
} }

View File

@ -42,8 +42,8 @@ public:
virtual void fromJsonObject(QJsonObject &json) override; virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGRemoteOutputSettings* fromJson(QString &jsonString) override; virtual SWGRemoteOutputSettings* fromJson(QString &jsonString) override;
qint32 getCenterFrequency(); qint64 getCenterFrequency();
void setCenterFrequency(qint32 center_frequency); void setCenterFrequency(qint64 center_frequency);
qint32 getSampleRate(); qint32 getSampleRate();
void setSampleRate(qint32 sample_rate); void setSampleRate(qint32 sample_rate);
@ -88,7 +88,7 @@ public:
virtual bool isSet() override; virtual bool isSet() override;
private: private:
qint32 center_frequency; qint64 center_frequency;
bool m_center_frequency_isSet; bool m_center_frequency_isSet;
qint32 sample_rate; qint32 sample_rate;

View File

@ -28,7 +28,7 @@ SWGSDRPlaySettings::SWGSDRPlaySettings(QString* json) {
} }
SWGSDRPlaySettings::SWGSDRPlaySettings() { SWGSDRPlaySettings::SWGSDRPlaySettings() {
center_frequency = 0; center_frequency = 0L;
m_center_frequency_isSet = false; m_center_frequency_isSet = false;
tuner_gain = 0; tuner_gain = 0;
m_tuner_gain_isSet = false; m_tuner_gain_isSet = false;
@ -76,7 +76,7 @@ SWGSDRPlaySettings::~SWGSDRPlaySettings() {
void void
SWGSDRPlaySettings::init() { SWGSDRPlaySettings::init() {
center_frequency = 0; center_frequency = 0L;
m_center_frequency_isSet = false; m_center_frequency_isSet = false;
tuner_gain = 0; tuner_gain = 0;
m_tuner_gain_isSet = false; m_tuner_gain_isSet = false;
@ -155,7 +155,7 @@ SWGSDRPlaySettings::fromJson(QString &json) {
void void
SWGSDRPlaySettings::fromJsonObject(QJsonObject &pJson) { SWGSDRPlaySettings::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&center_frequency, pJson["centerFrequency"], "qint32", ""); ::SWGSDRangel::setValue(&center_frequency, pJson["centerFrequency"], "qint64", "");
::SWGSDRangel::setValue(&tuner_gain, pJson["tunerGain"], "qint32", ""); ::SWGSDRangel::setValue(&tuner_gain, pJson["tunerGain"], "qint32", "");
@ -275,12 +275,12 @@ SWGSDRPlaySettings::asJsonObject() {
return obj; return obj;
} }
qint32 qint64
SWGSDRPlaySettings::getCenterFrequency() { SWGSDRPlaySettings::getCenterFrequency() {
return center_frequency; return center_frequency;
} }
void void
SWGSDRPlaySettings::setCenterFrequency(qint32 center_frequency) { SWGSDRPlaySettings::setCenterFrequency(qint64 center_frequency) {
this->center_frequency = center_frequency; this->center_frequency = center_frequency;
this->m_center_frequency_isSet = true; this->m_center_frequency_isSet = true;
} }

View File

@ -42,8 +42,8 @@ public:
virtual void fromJsonObject(QJsonObject &json) override; virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGSDRPlaySettings* fromJson(QString &jsonString) override; virtual SWGSDRPlaySettings* fromJson(QString &jsonString) override;
qint32 getCenterFrequency(); qint64 getCenterFrequency();
void setCenterFrequency(qint32 center_frequency); void setCenterFrequency(qint64 center_frequency);
qint32 getTunerGain(); qint32 getTunerGain();
void setTunerGain(qint32 tuner_gain); void setTunerGain(qint32 tuner_gain);
@ -106,7 +106,7 @@ public:
virtual bool isSet() override; virtual bool isSet() override;
private: private:
qint32 center_frequency; qint64 center_frequency;
bool m_center_frequency_isSet; bool m_center_frequency_isSet;
qint32 tuner_gain; qint32 tuner_gain;

View File

@ -28,7 +28,7 @@ SWGTestSourceSettings::SWGTestSourceSettings(QString* json) {
} }
SWGTestSourceSettings::SWGTestSourceSettings() { SWGTestSourceSettings::SWGTestSourceSettings() {
center_frequency = 0; center_frequency = 0L;
m_center_frequency_isSet = false; m_center_frequency_isSet = false;
frequency_shift = 0; frequency_shift = 0;
m_frequency_shift_isSet = false; m_frequency_shift_isSet = false;
@ -76,7 +76,7 @@ SWGTestSourceSettings::~SWGTestSourceSettings() {
void void
SWGTestSourceSettings::init() { SWGTestSourceSettings::init() {
center_frequency = 0; center_frequency = 0L;
m_center_frequency_isSet = false; m_center_frequency_isSet = false;
frequency_shift = 0; frequency_shift = 0;
m_frequency_shift_isSet = false; m_frequency_shift_isSet = false;
@ -155,7 +155,7 @@ SWGTestSourceSettings::fromJson(QString &json) {
void void
SWGTestSourceSettings::fromJsonObject(QJsonObject &pJson) { SWGTestSourceSettings::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&center_frequency, pJson["centerFrequency"], "qint32", ""); ::SWGSDRangel::setValue(&center_frequency, pJson["centerFrequency"], "qint64", "");
::SWGSDRangel::setValue(&frequency_shift, pJson["frequencyShift"], "qint32", ""); ::SWGSDRangel::setValue(&frequency_shift, pJson["frequencyShift"], "qint32", "");
@ -275,12 +275,12 @@ SWGTestSourceSettings::asJsonObject() {
return obj; return obj;
} }
qint32 qint64
SWGTestSourceSettings::getCenterFrequency() { SWGTestSourceSettings::getCenterFrequency() {
return center_frequency; return center_frequency;
} }
void void
SWGTestSourceSettings::setCenterFrequency(qint32 center_frequency) { SWGTestSourceSettings::setCenterFrequency(qint64 center_frequency) {
this->center_frequency = center_frequency; this->center_frequency = center_frequency;
this->m_center_frequency_isSet = true; this->m_center_frequency_isSet = true;
} }

View File

@ -42,8 +42,8 @@ public:
virtual void fromJsonObject(QJsonObject &json) override; virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGTestSourceSettings* fromJson(QString &jsonString) override; virtual SWGTestSourceSettings* fromJson(QString &jsonString) override;
qint32 getCenterFrequency(); qint64 getCenterFrequency();
void setCenterFrequency(qint32 center_frequency); void setCenterFrequency(qint64 center_frequency);
qint32 getFrequencyShift(); qint32 getFrequencyShift();
void setFrequencyShift(qint32 frequency_shift); void setFrequencyShift(qint32 frequency_shift);
@ -106,7 +106,7 @@ public:
virtual bool isSet() override; virtual bool isSet() override;
private: private:
qint32 center_frequency; qint64 center_frequency;
bool m_center_frequency_isSet; bool m_center_frequency_isSet;
qint32 frequency_shift; qint32 frequency_shift;