mirror of
https://github.com/f4exb/sdrangel.git
synced 2025-11-14 04:03:25 -05:00
Packet mod fixes
This commit is contained in:
f4exb
parent
2b48e969ba
commit
1ca1b504b2
@ -2138,13 +2138,11 @@ margin-bottom: 20px;
|
||||
"FileSourceActions" : {
|
||||
"$ref" : "#/definitions/FileSourceActions"
|
||||
},
|
||||
<<<<<<< ours
|
||||
"SigMFFileSinkActions" : {
|
||||
"$ref" : "#/definitions/SigMFFileSinkActions"
|
||||
=======
|
||||
},
|
||||
"PacketModActions" : {
|
||||
"$ref" : "#/definitions/PacketModActions"
|
||||
>>>>>>> theirs
|
||||
}
|
||||
},
|
||||
"description" : "Base channel actions. Only the channel actions corresponding to the channel specified in the channelType field is or should be present."
|
||||
@ -43965,11 +43963,7 @@ except ApiException as e:
|
||||
</div>
|
||||
<div id="generator">
|
||||
<div class="content">
|
||||
<<<<<<< ours
|
||||
Generated 2020-09-26T06:05:51.286+02:00
|
||||
=======
|
||||
Generated 2020-09-18T15:59:26.503+02:00
|
||||
>>>>>>> theirs
|
||||
Generated 2020-09-28T02:05:09.647+02:00
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -23,3 +23,5 @@ ChannelActions:
|
||||
$ref: "/doc/swagger/include/FileSource.yaml#/FileSourceActions"
|
||||
SigMFFileSinkActions:
|
||||
$ref: "/doc/swagger/include/SigMFFileSink.yaml#/SigMFFileSinkActions"
|
||||
PacketModActions:
|
||||
$ref: "/doc/swagger/include/PacketMod.yaml#/PacketModActions"
|
||||
|
||||
@ -39,6 +39,8 @@ ChannelReport:
|
||||
$ref: "/doc/swagger/include/NFMDemod.yaml#/NFMDemodReport"
|
||||
NFMModReport:
|
||||
$ref: "/doc/swagger/include/NFMMod.yaml#/NFMModReport"
|
||||
PacketModReport:
|
||||
$ref: "/doc/swagger/include/PacketMod.yaml#/PacketModReport"
|
||||
SSBDemodReport:
|
||||
$ref: "/doc/swagger/include/SSBDemod.yaml#/SSBDemodReport"
|
||||
RemoteSourceReport:
|
||||
|
||||
@ -59,6 +59,8 @@ ChannelSettings:
|
||||
$ref: "/doc/swagger/include/LocalSink.yaml#/LocalSinkSettings"
|
||||
LocalSourceSettings:
|
||||
$ref: "/doc/swagger/include/LocalSource.yaml#/LocalSourceSettings"
|
||||
PacketModSettings:
|
||||
$ref: "/doc/swagger/include/PacketMod.yaml#/PacketModSettings"
|
||||
RemoteSinkSettings:
|
||||
$ref: "/doc/swagger/include/RemoteSink.yaml#/RemoteSinkSettings"
|
||||
RemoteSourceSettings:
|
||||
|
||||
83
sdrbase/resources/webapi/doc/swagger/include/PacketMod.yaml
Normal file
83
sdrbase/resources/webapi/doc/swagger/include/PacketMod.yaml
Normal file
@ -0,0 +1,83 @@
|
||||
PacketModSettings:
|
||||
description: PacketMod
|
||||
properties:
|
||||
inputFrequencyOffset:
|
||||
type: integer
|
||||
format: int64
|
||||
rfBandwidth:
|
||||
type: number
|
||||
format: float
|
||||
fmDeviation:
|
||||
type: number
|
||||
format: float
|
||||
gain:
|
||||
type: number
|
||||
format: float
|
||||
channelMute:
|
||||
type: integer
|
||||
repeat:
|
||||
type: integer
|
||||
repeatDelay:
|
||||
type: number
|
||||
format: float
|
||||
repeatCount:
|
||||
type: integer
|
||||
ax25PreFlags:
|
||||
type: integer
|
||||
ax25PostFlags:
|
||||
type: integer
|
||||
preEmphasis:
|
||||
type: integer
|
||||
preEmphasisTau:
|
||||
type: number
|
||||
format: float
|
||||
preEmphasisHighFreq:
|
||||
type: number
|
||||
format: float
|
||||
rgbColor:
|
||||
type: integer
|
||||
title:
|
||||
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
|
||||
|
||||
PacketModReport:
|
||||
description: PacketMod
|
||||
properties:
|
||||
channelPowerDB:
|
||||
description: power transmitted in channel (dB)
|
||||
type: number
|
||||
format: float
|
||||
audioSampleRate:
|
||||
type: integer
|
||||
channelSampleRate:
|
||||
type: integer
|
||||
|
||||
PacketModActions:
|
||||
description: PacketMod
|
||||
properties:
|
||||
tx:
|
||||
type: object
|
||||
properties:
|
||||
callsign:
|
||||
type: string
|
||||
to:
|
||||
type: string
|
||||
via:
|
||||
type: string
|
||||
data:
|
||||
type: string
|
||||
description: >
|
||||
Transmit a packet
|
||||
@ -16,7 +16,6 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "crc.h"
|
||||
#include "QDebug.h"
|
||||
|
||||
// Reverse bit ordering
|
||||
uint32_t crc::reverse(uint32_t val, int bits)
|
||||
|
||||
@ -186,6 +186,7 @@ set(sdrgui_FORMS
|
||||
gui/deviceuserargsdialog.ui
|
||||
gui/editcommanddialog.ui
|
||||
gui/externalclockdialog.ui
|
||||
gui/fmpreemphasisdialog.ui
|
||||
gui/featureadddialog.ui
|
||||
gui/featurepresetsdialog.ui
|
||||
gui/glscopegui.ui
|
||||
|
||||
@ -39,6 +39,8 @@ ChannelReport:
|
||||
$ref: "http://swgserver:8081/api/swagger/include/NFMDemod.yaml#/NFMDemodReport"
|
||||
NFMModReport:
|
||||
$ref: "http://swgserver:8081/api/swagger/include/NFMMod.yaml#/NFMModReport"
|
||||
PacketModReport:
|
||||
$ref: "http://swgserver:8081/api/swagger/include/PacketMod.yaml#/PacketModReport"
|
||||
SSBDemodReport:
|
||||
$ref: "http://swgserver:8081/api/swagger/include/SSBDemod.yaml#/SSBDemodReport"
|
||||
RemoteSourceReport:
|
||||
|
||||
@ -2138,13 +2138,11 @@ margin-bottom: 20px;
|
||||
"FileSourceActions" : {
|
||||
"$ref" : "#/definitions/FileSourceActions"
|
||||
},
|
||||
<<<<<<< ours
|
||||
"SigMFFileSinkActions" : {
|
||||
"$ref" : "#/definitions/SigMFFileSinkActions"
|
||||
=======
|
||||
},
|
||||
"PacketModActions" : {
|
||||
"$ref" : "#/definitions/PacketModActions"
|
||||
>>>>>>> theirs
|
||||
}
|
||||
},
|
||||
"description" : "Base channel actions. Only the channel actions corresponding to the channel specified in the channelType field is or should be present."
|
||||
@ -43965,11 +43963,7 @@ except ApiException as e:
|
||||
</div>
|
||||
<div id="generator">
|
||||
<div class="content">
|
||||
<<<<<<< ours
|
||||
Generated 2020-09-26T06:05:51.286+02:00
|
||||
=======
|
||||
Generated 2020-09-18T15:59:26.503+02:00
|
||||
>>>>>>> theirs
|
||||
Generated 2020-09-28T02:05:09.647+02:00
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -86,6 +86,7 @@ SWGChannelActions::cleanup() {
|
||||
}
|
||||
if(sig_mf_file_sink_actions != nullptr) {
|
||||
delete sig_mf_file_sink_actions;
|
||||
}
|
||||
if(packet_mod_actions != nullptr) {
|
||||
delete packet_mod_actions;
|
||||
}
|
||||
@ -115,6 +116,7 @@ SWGChannelActions::fromJsonObject(QJsonObject &pJson) {
|
||||
::SWGSDRangel::setValue(&file_source_actions, pJson["FileSourceActions"], "SWGFileSourceActions", "SWGFileSourceActions");
|
||||
|
||||
::SWGSDRangel::setValue(&sig_mf_file_sink_actions, pJson["SigMFFileSinkActions"], "SWGSigMFFileSinkActions", "SWGSigMFFileSinkActions");
|
||||
|
||||
::SWGSDRangel::setValue(&packet_mod_actions, pJson["PacketModActions"], "SWGPacketModActions", "SWGPacketModActions");
|
||||
|
||||
}
|
||||
@ -229,6 +231,8 @@ void
|
||||
SWGChannelActions::setSigMfFileSinkActions(SWGSigMFFileSinkActions* sig_mf_file_sink_actions) {
|
||||
this->sig_mf_file_sink_actions = sig_mf_file_sink_actions;
|
||||
this->m_sig_mf_file_sink_actions_isSet = true;
|
||||
}
|
||||
|
||||
SWGPacketModActions*
|
||||
SWGChannelActions::getPacketModActions() {
|
||||
return packet_mod_actions;
|
||||
@ -263,6 +267,8 @@ SWGChannelActions::isSet(){
|
||||
isObjectUpdated = true; break;
|
||||
}
|
||||
if(sig_mf_file_sink_actions && sig_mf_file_sink_actions->isSet()){
|
||||
isObjectUpdated = true; break;
|
||||
}
|
||||
if(packet_mod_actions && packet_mod_actions->isSet()){
|
||||
isObjectUpdated = true; break;
|
||||
}
|
||||
@ -271,4 +277,3 @@ SWGChannelActions::isSet(){
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -24,8 +24,8 @@
|
||||
|
||||
#include "SWGFileSinkActions.h"
|
||||
#include "SWGFileSourceActions.h"
|
||||
#include "SWGSigMFFileSinkActions.h"
|
||||
#include "SWGPacketModActions.h"
|
||||
#include "SWGSigMFFileSinkActions.h"
|
||||
#include <QString>
|
||||
|
||||
#include "SWGObject.h"
|
||||
@ -66,6 +66,7 @@ public:
|
||||
|
||||
SWGSigMFFileSinkActions* getSigMfFileSinkActions();
|
||||
void setSigMfFileSinkActions(SWGSigMFFileSinkActions* sig_mf_file_sink_actions);
|
||||
|
||||
SWGPacketModActions* getPacketModActions();
|
||||
void setPacketModActions(SWGPacketModActions* packet_mod_actions);
|
||||
|
||||
@ -93,10 +94,12 @@ private:
|
||||
|
||||
SWGSigMFFileSinkActions* sig_mf_file_sink_actions;
|
||||
bool m_sig_mf_file_sink_actions_isSet;
|
||||
|
||||
SWGPacketModActions* packet_mod_actions;
|
||||
bool m_packet_mod_actions_isSet;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif /* SWGChannelActions_H_ */
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* SDRangel
|
||||
* This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
|
||||
*
|
||||
* OpenAPI spec version: 4.15.0
|
||||
* OpenAPI spec version: 5.9.0
|
||||
* Contact: f4exb06@gmail.com
|
||||
*
|
||||
* NOTE: This class is auto generated by the swagger code generator program.
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* SDRangel
|
||||
* This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
|
||||
*
|
||||
* OpenAPI spec version: 4.15.0
|
||||
* OpenAPI spec version: 5.9.0
|
||||
* Contact: f4exb06@gmail.com
|
||||
*
|
||||
* NOTE: This class is auto generated by the swagger code generator program.
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* SDRangel
|
||||
* This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
|
||||
*
|
||||
* OpenAPI spec version: 4.15.0
|
||||
* OpenAPI spec version: 5.9.0
|
||||
* Contact: f4exb06@gmail.com
|
||||
*
|
||||
* NOTE: This class is auto generated by the swagger code generator program.
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* SDRangel
|
||||
* This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
|
||||
*
|
||||
* OpenAPI spec version: 4.15.0
|
||||
* OpenAPI spec version: 5.9.0
|
||||
* Contact: f4exb06@gmail.com
|
||||
*
|
||||
* NOTE: This class is auto generated by the swagger code generator program.
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* SDRangel
|
||||
* This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
|
||||
*
|
||||
* OpenAPI spec version: 4.15.0
|
||||
* OpenAPI spec version: 5.9.0
|
||||
* Contact: f4exb06@gmail.com
|
||||
*
|
||||
* NOTE: This class is auto generated by the swagger code generator program.
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* SDRangel
|
||||
* This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
|
||||
*
|
||||
* OpenAPI spec version: 4.15.0
|
||||
* OpenAPI spec version: 5.9.0
|
||||
* Contact: f4exb06@gmail.com
|
||||
*
|
||||
* NOTE: This class is auto generated by the swagger code generator program.
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* SDRangel
|
||||
* This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
|
||||
*
|
||||
* OpenAPI spec version: 4.15.0
|
||||
* OpenAPI spec version: 5.9.0
|
||||
* Contact: f4exb06@gmail.com
|
||||
*
|
||||
* NOTE: This class is auto generated by the swagger code generator program.
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* SDRangel
|
||||
* This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
|
||||
*
|
||||
* OpenAPI spec version: 4.15.0
|
||||
* OpenAPI spec version: 5.9.0
|
||||
* Contact: f4exb06@gmail.com
|
||||
*
|
||||
* NOTE: This class is auto generated by the swagger code generator program.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user