VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-17 13:51:47 -05:00
Code Issues Projects Releases Wiki Activity

VOR demod: added missing bits

Browse Source
This commit is contained in:
f4exb 2020-11-24 21:45:48 +01:00
parent 505c31f46a
commit 10eb25d8b7
8 changed files with 214 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/channelrx/demodvor/vordemodwebapiadapter.cpp
View File

@ -44,6 +44,7 @@ int VORDemodWebAPIAdapter::webapiSettingsPutPatch(
SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage)
{
(void) force;
(void) errorMessage;
VORDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);

1
sdrbase/resources/webapi.qrc
View File

@ -83,6 +83,7 @@
<file>webapi/doc/swagger/include/UDPSink.yaml</file>
<file>webapi/doc/swagger/include/User.yaml</file>
<file>webapi/doc/swagger/include/USRP.yaml</file>
<file>webapi/doc/swagger/include/VORDemod.yaml</file>
<file>webapi/doc/swagger/include/WFMDemod.yaml</file>
<file>webapi/doc/swagger/include/WFMMod.yaml</file>
<file>webapi/doc/swagger/include/Xtrx.yaml</file>

79
sdrbase/resources/webapi/doc/html2/index.html
View File

@ -2570,6 +2570,9 @@ margin-bottom: 20px;
"UDPSinkReport" : {
"$ref" : "#/definitions/UDPSinkReport"
},
"VORDemodReport" : {
"$ref" : "#/definitions/VORDemodReport"
},
"WFMDemodReport" : {
"$ref" : "#/definitions/WFMDemodReport"
},
@ -2692,6 +2695,9 @@ margin-bottom: 20px;
"UDPSinkSettings" : {
"$ref" : "#/definitions/UDPSinkSettings"
},
"VORDemodSettings" : {
"$ref" : "#/definitions/VORDemodSettings"
},
"WFMDemodSettings" : {
"$ref" : "#/definitions/WFMDemodSettings"
},
@ -9427,6 +9433,77 @@ margin-bottom: 20px;
}
},
"description" : "USRP"
};
defs.VORDemodReport = {
"properties" : {
"channelPowerDB" : {
"type" : "number",
"format" : "float",
"description" : "power received in channel (dB)"
},
"squelch" : {
"type" : "integer",
"description" : "squelch status (1 if open else 0)"
},
"audioSampleRate" : {
"type" : "integer"
}
},
"description" : "VORDemod"
};
defs.VORDemodSettings = {
"properties" : {
"squelch" : {
"type" : "number",
"format" : "float",
"description" : "power squelch threshold in decibels"
},
"volume" : {
"type" : "number",
"format" : "float"
},
"audioMute" : {
"type" : "integer"
},
"rgbColor" : {
"type" : "integer"
},
"title" : {
"type" : "string"
},
"audioDeviceName" : {
"type" : "string"
},
"streamIndex" : {
"type" : "integer",
"description" : "MIMO channel. Not relevant when connected to SI (single Rx)."
},
"useReverseAPI" : {
"type" : "integer",
"description" : "Synchronize with reverse API (1 for yes, 0 for no)"
},
"reverseAPIAddress" : {
"type" : "string"
},
"reverseAPIPort" : {
"type" : "integer"
},
"reverseAPIDeviceIndex" : {
"type" : "integer"
},
"reverseAPIChannelIndex" : {
"type" : "integer"
},
"identThreshold" : {
"type" : "integer",
"description" : "Morse code ident threshold (linear SNR)"
},
"magDecAdjust" : {
"type" : "integer",
"description" : "Adjust radial lines on map for magnetic declination of VOR"
}
},
"description" : "VORDemod"
};
defs.WFMDemodReport = {
"properties" : {
@ -44629,7 +44706,7 @@ except ApiException as e:
</div>
<div id="generator">
<div class="content">
Generated 2020-11-21T10:29:19.215+01:00
Generated 2020-11-24T20:20:00.458+01:00
</div>
</div>
</div>

2
sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml
View File

@ -57,6 +57,8 @@ ChannelReport:
$ref: "/doc/swagger/include/UDPSource.yaml#/UDPSourceReport"
UDPSinkReport:
$ref: "/doc/swagger/include/UDPSink.yaml#/UDPSinkReport"
VORDemodReport:
$ref: "/doc/swagger/include/VORDemod.yaml#/VORDemodReport"
WFMDemodReport:
$ref: "/doc/swagger/include/WFMDemod.yaml#/WFMDemodReport"
WFMModReport:

2
sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml
View File

@ -79,6 +79,8 @@ ChannelSettings:
$ref: "/doc/swagger/include/UDPSource.yaml#/UDPSourceSettings"
UDPSinkSettings:
$ref: "/doc/swagger/include/UDPSink.yaml#/UDPSinkSettings"
VORDemodSettings:
$ref: "/doc/swagger/include/VORDemod.yaml#/VORDemodSettings"
WFMDemodSettings:
$ref: "/doc/swagger/include/WFMDemod.yaml#/WFMDemodSettings"
WFMModSettings:

51
sdrbase/resources/webapi/doc/swagger/include/VORDemod.yaml Normal file
View File

@ -0,0 +1,51 @@
VORDemodSettings:
description: VORDemod
properties:
squelch:
description: power squelch threshold in decibels
type: number
format: float
volume:
type: number
format: float
audioMute:
type: integer
rgbColor:
type: integer
title:
type: string
audioDeviceName:
type: string
streamIndex:
description: MIMO channel. Not relevant when connected to SI (single Rx).
type: integer
useReverseAPI:
description: Synchronize with reverse API (1 for yes, 0 for no)
type: integer
reverseAPIAddress:
type: string
reverseAPIPort:
type: integer
reverseAPIDeviceIndex:
type: integer
reverseAPIChannelIndex:
type: integer
identThreshold:
description: Morse code ident threshold (linear SNR)
type: integer
magDecAdjust:
description: Adjust radial lines on map for magnetic declination of VOR
type: integer
VORDemodReport:
description: VORDemod
properties:
channelPowerDB:
description: power received in channel (dB)
type: number
format: float
squelch:
description: squelch status (1 if open else 0)
type: integer
audioSampleRate:
type: integer

2
sdrbase/util/morse.cpp
View File

@ -180,7 +180,7 @@ QString Morse::toSpacedUnicodeMorse(QString &string)
// Converts a Morse sequence to an ASCII character. -1 if no mapping found.
int Morse::toASCII(QString &morse)
{
for (int i = 0; i < COUNT_OF(m_asciiToMorse); i++)
for (unsigned int i = 0; i < COUNT_OF(m_asciiToMorse); i++)
{
if (morse == m_asciiToMorse[i].morse)
return m_asciiToMorse[i].ascii;

79
swagger/sdrangel/code/html2/index.html
View File

@ -2570,6 +2570,9 @@ margin-bottom: 20px;
"UDPSinkReport" : {
"$ref" : "#/definitions/UDPSinkReport"
},
"VORDemodReport" : {
"$ref" : "#/definitions/VORDemodReport"
},
"WFMDemodReport" : {
"$ref" : "#/definitions/WFMDemodReport"
},
@ -2692,6 +2695,9 @@ margin-bottom: 20px;
"UDPSinkSettings" : {
"$ref" : "#/definitions/UDPSinkSettings"
},
"VORDemodSettings" : {
"$ref" : "#/definitions/VORDemodSettings"
},
"WFMDemodSettings" : {
"$ref" : "#/definitions/WFMDemodSettings"
},
@ -9427,6 +9433,77 @@ margin-bottom: 20px;
}
},
"description" : "USRP"
};
defs.VORDemodReport = {
"properties" : {
"channelPowerDB" : {
"type" : "number",
"format" : "float",
"description" : "power received in channel (dB)"
},
"squelch" : {
"type" : "integer",
"description" : "squelch status (1 if open else 0)"
},
"audioSampleRate" : {
"type" : "integer"
}
},
"description" : "VORDemod"
};
defs.VORDemodSettings = {
"properties" : {
"squelch" : {
"type" : "number",
"format" : "float",
"description" : "power squelch threshold in decibels"
},
"volume" : {
"type" : "number",
"format" : "float"
},
"audioMute" : {
"type" : "integer"
},
"rgbColor" : {
"type" : "integer"
},
"title" : {
"type" : "string"
},
"audioDeviceName" : {
"type" : "string"
},
"streamIndex" : {
"type" : "integer",
"description" : "MIMO channel. Not relevant when connected to SI (single Rx)."
},
"useReverseAPI" : {
"type" : "integer",
"description" : "Synchronize with reverse API (1 for yes, 0 for no)"
},
"reverseAPIAddress" : {
"type" : "string"
},
"reverseAPIPort" : {
"type" : "integer"
},
"reverseAPIDeviceIndex" : {
"type" : "integer"
},
"reverseAPIChannelIndex" : {
"type" : "integer"
},
"identThreshold" : {
"type" : "integer",
"description" : "Morse code ident threshold (linear SNR)"
},
"magDecAdjust" : {
"type" : "integer",
"description" : "Adjust radial lines on map for magnetic declination of VOR"
}
},
"description" : "VORDemod"
};
defs.WFMDemodReport = {
"properties" : {
@ -44629,7 +44706,7 @@ except ApiException as e:
</div>
<div id="generator">
<div class="content">
Generated 2020-11-21T10:29:19.215+01:00
Generated 2020-11-24T20:20:00.458+01:00
</div>
</div>
</div>