BladeRF2: REST API: add scale in range report generated code

This commit is contained in:
f4exb 2020-09-14 23:37:20 +02:00
parent d1366c0aca
commit 8db26917c5
7 changed files with 84 additions and 5 deletions

View File

@ -3697,6 +3697,10 @@ margin-bottom: 20px;
}, },
"step" : { "step" : {
"type" : "integer" "type" : "integer"
},
"scale" : {
"type" : "number",
"format" : "float"
} }
}, },
"description" : "An frequency range with 64 bit support for min and max" "description" : "An frequency range with 64 bit support for min and max"
@ -5418,6 +5422,10 @@ margin-bottom: 20px;
}, },
"step" : { "step" : {
"type" : "integer" "type" : "integer"
},
"scale" : {
"type" : "number",
"format" : "float"
} }
}, },
"description" : "An arbitrary range of integer values" "description" : "An arbitrary range of integer values"
@ -33319,7 +33327,7 @@ except ApiException as e:
</div> </div>
<div id="generator"> <div id="generator">
<div class="content"> <div class="content">
Generated 2020-09-10T15:07:12.501+02:00 Generated 2020-09-14T23:30:27.272+02:00
</div> </div>
</div> </div>
</div> </div>

View File

@ -41,6 +41,9 @@ Range:
type: integer type: integer
step: step:
type: integer type: integer
scale:
type: number
format: float
RangeFloat: RangeFloat:
description: An arbitrary range of floating point values description: An arbitrary range of floating point values
@ -53,7 +56,7 @@ RangeFloat:
format: float format: float
step: step:
type: number type: number
format: float format: float
FrequencyRange: FrequencyRange:
description: An frequency range with 64 bit support for min and max description: An frequency range with 64 bit support for min and max
@ -66,6 +69,9 @@ FrequencyRange:
format: int64 format: int64
step: step:
type: integer type: integer
scale:
type: number
format: float
NamedEnum: NamedEnum:
description: Enumeration with name for values description: Enumeration with name for values
@ -74,7 +80,7 @@ NamedEnum:
type: string type: string
value: value:
type: integer type: integer
Complex: Complex:
description: A complex number description: A complex number
properties: properties:
@ -84,4 +90,3 @@ Complex:
imag: imag:
type: number type: number
format: float format: float

View File

@ -3697,6 +3697,10 @@ margin-bottom: 20px;
}, },
"step" : { "step" : {
"type" : "integer" "type" : "integer"
},
"scale" : {
"type" : "number",
"format" : "float"
} }
}, },
"description" : "An frequency range with 64 bit support for min and max" "description" : "An frequency range with 64 bit support for min and max"
@ -5418,6 +5422,10 @@ margin-bottom: 20px;
}, },
"step" : { "step" : {
"type" : "integer" "type" : "integer"
},
"scale" : {
"type" : "number",
"format" : "float"
} }
}, },
"description" : "An arbitrary range of integer values" "description" : "An arbitrary range of integer values"
@ -33319,7 +33327,7 @@ except ApiException as e:
</div> </div>
<div id="generator"> <div id="generator">
<div class="content"> <div class="content">
Generated 2020-09-10T15:07:12.501+02:00 Generated 2020-09-14T23:30:27.272+02:00
</div> </div>
</div> </div>
</div> </div>

View File

@ -34,6 +34,8 @@ SWGFrequencyRange::SWGFrequencyRange() {
m_max_isSet = false; m_max_isSet = false;
step = 0; step = 0;
m_step_isSet = false; m_step_isSet = false;
scale = 0.0f;
m_scale_isSet = false;
} }
SWGFrequencyRange::~SWGFrequencyRange() { SWGFrequencyRange::~SWGFrequencyRange() {
@ -48,6 +50,8 @@ SWGFrequencyRange::init() {
m_max_isSet = false; m_max_isSet = false;
step = 0; step = 0;
m_step_isSet = false; m_step_isSet = false;
scale = 0.0f;
m_scale_isSet = false;
} }
void void
@ -55,6 +59,7 @@ SWGFrequencyRange::cleanup() {
} }
SWGFrequencyRange* SWGFrequencyRange*
@ -74,6 +79,8 @@ SWGFrequencyRange::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&step, pJson["step"], "qint32", ""); ::SWGSDRangel::setValue(&step, pJson["step"], "qint32", "");
::SWGSDRangel::setValue(&scale, pJson["scale"], "float", "");
} }
QString QString
@ -99,6 +106,9 @@ SWGFrequencyRange::asJsonObject() {
if(m_step_isSet){ if(m_step_isSet){
obj->insert("step", QJsonValue(step)); obj->insert("step", QJsonValue(step));
} }
if(m_scale_isSet){
obj->insert("scale", QJsonValue(scale));
}
return obj; return obj;
} }
@ -133,6 +143,16 @@ SWGFrequencyRange::setStep(qint32 step) {
this->m_step_isSet = true; this->m_step_isSet = true;
} }
float
SWGFrequencyRange::getScale() {
return scale;
}
void
SWGFrequencyRange::setScale(float scale) {
this->scale = scale;
this->m_scale_isSet = true;
}
bool bool
SWGFrequencyRange::isSet(){ SWGFrequencyRange::isSet(){
@ -147,6 +167,9 @@ SWGFrequencyRange::isSet(){
if(m_step_isSet){ if(m_step_isSet){
isObjectUpdated = true; break; isObjectUpdated = true; break;
} }
if(m_scale_isSet){
isObjectUpdated = true; break;
}
}while(false); }while(false);
return isObjectUpdated; return isObjectUpdated;
} }

View File

@ -50,6 +50,9 @@ public:
qint32 getStep(); qint32 getStep();
void setStep(qint32 step); void setStep(qint32 step);
float getScale();
void setScale(float scale);
virtual bool isSet() override; virtual bool isSet() override;
@ -63,6 +66,9 @@ private:
qint32 step; qint32 step;
bool m_step_isSet; bool m_step_isSet;
float scale;
bool m_scale_isSet;
}; };
} }

View File

@ -34,6 +34,8 @@ SWGRange::SWGRange() {
m_max_isSet = false; m_max_isSet = false;
step = 0; step = 0;
m_step_isSet = false; m_step_isSet = false;
scale = 0.0f;
m_scale_isSet = false;
} }
SWGRange::~SWGRange() { SWGRange::~SWGRange() {
@ -48,6 +50,8 @@ SWGRange::init() {
m_max_isSet = false; m_max_isSet = false;
step = 0; step = 0;
m_step_isSet = false; m_step_isSet = false;
scale = 0.0f;
m_scale_isSet = false;
} }
void void
@ -55,6 +59,7 @@ SWGRange::cleanup() {
} }
SWGRange* SWGRange*
@ -74,6 +79,8 @@ SWGRange::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&step, pJson["step"], "qint32", ""); ::SWGSDRangel::setValue(&step, pJson["step"], "qint32", "");
::SWGSDRangel::setValue(&scale, pJson["scale"], "float", "");
} }
QString QString
@ -99,6 +106,9 @@ SWGRange::asJsonObject() {
if(m_step_isSet){ if(m_step_isSet){
obj->insert("step", QJsonValue(step)); obj->insert("step", QJsonValue(step));
} }
if(m_scale_isSet){
obj->insert("scale", QJsonValue(scale));
}
return obj; return obj;
} }
@ -133,6 +143,16 @@ SWGRange::setStep(qint32 step) {
this->m_step_isSet = true; this->m_step_isSet = true;
} }
float
SWGRange::getScale() {
return scale;
}
void
SWGRange::setScale(float scale) {
this->scale = scale;
this->m_scale_isSet = true;
}
bool bool
SWGRange::isSet(){ SWGRange::isSet(){
@ -147,6 +167,9 @@ SWGRange::isSet(){
if(m_step_isSet){ if(m_step_isSet){
isObjectUpdated = true; break; isObjectUpdated = true; break;
} }
if(m_scale_isSet){
isObjectUpdated = true; break;
}
}while(false); }while(false);
return isObjectUpdated; return isObjectUpdated;
} }

View File

@ -50,6 +50,9 @@ public:
qint32 getStep(); qint32 getStep();
void setStep(qint32 step); void setStep(qint32 step);
float getScale();
void setScale(float scale);
virtual bool isSet() override; virtual bool isSet() override;
@ -63,6 +66,9 @@ private:
qint32 step; qint32 step;
bool m_step_isSet; bool m_step_isSet;
float scale;
bool m_scale_isSet;
}; };
} }