- Generated 2024-04-04T16:23:36.765+02:00
+ Generated 2024-04-07T17:52:28.367+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelPower.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelPower.yaml
index 068d62151..ce8c6cdde 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/ChannelPower.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelPower.yaml
@@ -4,6 +4,13 @@ ChannelPowerSettings:
inputFrequencyOffset:
type: integer
format: int64
+ frequencyMode:
+ description: (0 for Offset, 1 for Absolute)
+ type: integer
+ frequency:
+ description: Channel center frequency
+ type: integer
+ format: int64
rfBandwidth:
type: number
format: float
diff --git a/sdrbase/resources/webapi/doc/swagger/include/RadioClock.yaml b/sdrbase/resources/webapi/doc/swagger/include/RadioClock.yaml
index 8acd20869..600ee71bb 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/RadioClock.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/RadioClock.yaml
@@ -5,6 +5,13 @@ RadioClockSettings:
description: channel center frequency shift from baseband center in Hz
type: integer
format: int64
+ frequencyMode:
+ description: (0 for Offset, 1 for Absolute)
+ type: integer
+ frequency:
+ description: Channel center frequency
+ type: integer
+ format: int64
rfBandwidth:
description: channel RF bandwidth in Hz
type: number
@@ -13,7 +20,7 @@ RadioClockSettings:
type: number
format: float
modulation:
- description: 0 - MSF, 1 - DCF77, 2 - TDF, 3 - WWVB
+ description: 0 - MSF, 1 - DCF77, 2 - TDF, 3 - WWVB, 4 - JJY
type: integer
timezone:
description: 0 - Broadcast, 1 - Local, 2 - UTC
diff --git a/sdrbase/webapi/webapiutils.cpp b/sdrbase/webapi/webapiutils.cpp
index 3ceb398b4..5ed235b3d 100644
--- a/sdrbase/webapi/webapiutils.cpp
+++ b/sdrbase/webapi/webapiutils.cpp
@@ -584,6 +584,54 @@ bool WebAPIUtils::getSubObjectIntList(const QJsonObject &json, const QString &ke
return false;
}
+bool WebAPIUtils::hasSubObject(const QJsonObject &json, const QString &key)
+{
+ for (QJsonObject::const_iterator it = json.begin(); it != json.end(); it++)
+ {
+ QJsonValue jsonValue = it.value();
+
+ if (jsonValue.isObject())
+ {
+ QJsonObject subObject = jsonValue.toObject();
+
+ if (subObject.contains(key)) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+}
+
+// Set value withing nested JSON object
+bool WebAPIUtils::setSubObject(QJsonObject &json, const QString &key, const QVariant &value)
+{
+ for (QJsonObject::iterator it = json.begin(); it != json.end(); it++)
+ {
+ QJsonValue jsonValue = it.value();
+
+ if (jsonValue.isObject())
+ {
+ QJsonObject subObject = jsonValue.toObject();
+
+ if (subObject.contains(key))
+ {
+ if (subObject[key].isString()) {
+ subObject[key] = value.toString();
+ } else if (subObject[key].isDouble()) {
+ subObject[key] = value.toDouble();
+ } else {
+ qDebug() << "WebAPIUtils::setSubObject: Unsupported type";
+ }
+ it.value() = subObject;
+ return true;
+ }
+ }
+ }
+
+ return false;
+}
+
// look for value in key=value
bool WebAPIUtils::extractValue(const QJsonObject &json, const QString &key, QJsonValue &value)
{
diff --git a/sdrbase/webapi/webapiutils.h b/sdrbase/webapi/webapiutils.h
index 752996217..243053362 100644
--- a/sdrbase/webapi/webapiutils.h
+++ b/sdrbase/webapi/webapiutils.h
@@ -54,6 +54,8 @@ public:
static bool getSubObjectString(const QJsonObject &json, const QString &key, QString &value);
static bool setSubObjectString(QJsonObject &json, const QString &key, const QString &value);
static bool getSubObjectIntList(const QJsonObject &json, const QString &key, const QString &subKey, QList