diff --git a/sdrbase/resources/webapi.qrc b/sdrbase/resources/webapi.qrc index 162dedc05..e07ab0333 100644 --- a/sdrbase/resources/webapi.qrc +++ b/sdrbase/resources/webapi.qrc @@ -37,6 +37,7 @@ webapi/doc/swagger/include/LocalOutput.yaml webapi/doc/swagger/include/NFMDemod.yaml webapi/doc/swagger/include/NFMMod.yaml + webapi/doc/swagger/include/PacketMod.yaml webapi/doc/swagger/include/Perseus.yaml webapi/doc/swagger/include/PlutoSdr.yaml webapi/doc/swagger/include/Preferences.yaml diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index bbb0fb7bf..284281f6c 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -4934,7 +4934,7 @@ margin-bottom: 20px; }, "mode" : { "type" : "string", - "description" : "Transmission mode. \"1200 AFSK\" or \"9600 FSK\"." + "description" : "Transmission mode\n * \"1200 AFSK\"\n * \"9600 FSK\".\n" }, "rfBandwidth" : { "type" : "number", @@ -4961,12 +4961,37 @@ margin-bottom: 20px; "repeatCount" : { "type" : "integer" }, + "rampUpBits" : { + "type" : "integer" + }, + "rampDownBits" : { + "type" : "integer" + }, + "rampRange" : { + "type" : "integer" + }, + "modulateWhileRamping" : { + "type" : "integer", + "description" : "Boolean\n * 0 - off\n * 1 - on\n" + }, + "markFrequency" : { + "type" : "integer" + }, + "spaceFrequency" : { + "type" : "integer" + }, "ax25PreFlags" : { "type" : "integer" }, "ax25PostFlags" : { "type" : "integer" }, + "ax25Control" : { + "type" : "integer" + }, + "ax25PID" : { + "type" : "integer" + }, "preEmphasis" : { "type" : "integer" }, @@ -4978,6 +5003,36 @@ margin-bottom: 20px; "type" : "number", "format" : "float" }, + "lpfTaps" : { + "type" : "integer" + }, + "bbNoise" : { + "type" : "integer", + "description" : "Boolean\n * 0 - off\n * 1 - on\n" + }, + "rfNoise" : { + "type" : "integer", + "description" : "Boolean\n * 0 - off\n * 1 - on\n" + }, + "writeToFile" : { + "type" : "integer", + "description" : "Boolean\n * 0 - off\n * 1 - on\n" + }, + "spectrumRate" : { + "type" : "integer" + }, + "callsign" : { + "type" : "string" + }, + "to" : { + "type" : "string" + }, + "via" : { + "type" : "string" + }, + "data" : { + "type" : "string" + }, "bpf" : { "type" : "integer" }, @@ -4989,6 +5044,27 @@ margin-bottom: 20px; "type" : "number", "format" : "float" }, + "bpfTaps" : { + "type" : "integer" + }, + "scramble" : { + "type" : "integer", + "description" : "Boolean\n * 0 - off\n * 1 - on\n" + }, + "polynomial" : { + "type" : "integer" + }, + "pulseShaping" : { + "type" : "integer", + "description" : "Boolean\n * 0 - off\n * 1 - on\n" + }, + "beta" : { + "type" : "number", + "format" : "float" + }, + "symbolSpan" : { + "type" : "integer" + }, "rgbColor" : { "type" : "integer" }, @@ -33469,7 +33545,7 @@ except ApiException as e:
- Generated 2020-09-23T09:56:01.490+02:00 + Generated 2020-09-24T10:53:43.785+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelActions.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelActions.yaml index 7f98439fb..e0f3d2256 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ChannelActions.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelActions.yaml @@ -21,3 +21,5 @@ ChannelActions: $ref: "/doc/swagger/include/FileSink.yaml#/FileSinkActions" FileSourceActions: $ref: "/doc/swagger/include/FileSource.yaml#/FileSourceActions" + PacketModActions: + $ref: "/doc/swagger/include/PacketMod.yaml#/PacketModActions" diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml index c2f26fcc2..cb25ac431 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml @@ -51,6 +51,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: diff --git a/sdrbase/resources/webapi/doc/swagger/include/PacketMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/PacketMod.yaml new file mode 100644 index 000000000..053018c3f --- /dev/null +++ b/sdrbase/resources/webapi/doc/swagger/include/PacketMod.yaml @@ -0,0 +1,168 @@ +PacketModSettings: + description: PacketMod + properties: + inputFrequencyOffset: + type: integer + format: int64 + mode: + type: string + description: > + Transmission mode + * "1200 AFSK" + * "9600 FSK". + 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 + rampUpBits: + type: integer + rampDownBits: + type: integer + rampRange: + type: integer + modulateWhileRamping: + type: integer + description: > + Boolean + * 0 - off + * 1 - on + markFrequency: + type: integer + spaceFrequency: + type: integer + ax25PreFlags: + type: integer + ax25PostFlags: + type: integer + ax25Control: + type: integer + ax25PID: + type: integer + preEmphasis: + type: integer + preEmphasisTau: + type: number + format: float + preEmphasisHighFreq: + type: number + format: float + lpfTaps: + type: integer + bbNoise: + type: integer + description: > + Boolean + * 0 - off + * 1 - on + rfNoise: + type: integer + description: > + Boolean + * 0 - off + * 1 - on + writeToFile: + type: integer + description: > + Boolean + * 0 - off + * 1 - on + spectrumRate: + type: integer + callsign: + type: string + to: + type: string + via: + type: string + data: + type: string + bpf: + type: integer + bpfLowCutoff: + type: number + format: float + bpfHighCutoff: + type: number + format: float + bpfTaps: + type: integer + scramble: + type: integer + description: > + Boolean + * 0 - off + * 1 - on + polynomial: + type: integer + pulseShaping: + type: integer + description: > + Boolean + * 0 - off + * 1 - on + beta: + type: number + format: float + symbolSpan: + type: integer + 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 diff --git a/sdrbase/resources/webapi/doc/swagger/swagger.yaml b/sdrbase/resources/webapi/doc/swagger/swagger.yaml index 63129a2b5..021bc1ae9 100644 --- a/sdrbase/resources/webapi/doc/swagger/swagger.yaml +++ b/sdrbase/resources/webapi/doc/swagger/swagger.yaml @@ -2356,6 +2356,8 @@ definitions: $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: diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index bbb0fb7bf..284281f6c 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -4934,7 +4934,7 @@ margin-bottom: 20px; }, "mode" : { "type" : "string", - "description" : "Transmission mode. \"1200 AFSK\" or \"9600 FSK\"." + "description" : "Transmission mode\n * \"1200 AFSK\"\n * \"9600 FSK\".\n" }, "rfBandwidth" : { "type" : "number", @@ -4961,12 +4961,37 @@ margin-bottom: 20px; "repeatCount" : { "type" : "integer" }, + "rampUpBits" : { + "type" : "integer" + }, + "rampDownBits" : { + "type" : "integer" + }, + "rampRange" : { + "type" : "integer" + }, + "modulateWhileRamping" : { + "type" : "integer", + "description" : "Boolean\n * 0 - off\n * 1 - on\n" + }, + "markFrequency" : { + "type" : "integer" + }, + "spaceFrequency" : { + "type" : "integer" + }, "ax25PreFlags" : { "type" : "integer" }, "ax25PostFlags" : { "type" : "integer" }, + "ax25Control" : { + "type" : "integer" + }, + "ax25PID" : { + "type" : "integer" + }, "preEmphasis" : { "type" : "integer" }, @@ -4978,6 +5003,36 @@ margin-bottom: 20px; "type" : "number", "format" : "float" }, + "lpfTaps" : { + "type" : "integer" + }, + "bbNoise" : { + "type" : "integer", + "description" : "Boolean\n * 0 - off\n * 1 - on\n" + }, + "rfNoise" : { + "type" : "integer", + "description" : "Boolean\n * 0 - off\n * 1 - on\n" + }, + "writeToFile" : { + "type" : "integer", + "description" : "Boolean\n * 0 - off\n * 1 - on\n" + }, + "spectrumRate" : { + "type" : "integer" + }, + "callsign" : { + "type" : "string" + }, + "to" : { + "type" : "string" + }, + "via" : { + "type" : "string" + }, + "data" : { + "type" : "string" + }, "bpf" : { "type" : "integer" }, @@ -4989,6 +5044,27 @@ margin-bottom: 20px; "type" : "number", "format" : "float" }, + "bpfTaps" : { + "type" : "integer" + }, + "scramble" : { + "type" : "integer", + "description" : "Boolean\n * 0 - off\n * 1 - on\n" + }, + "polynomial" : { + "type" : "integer" + }, + "pulseShaping" : { + "type" : "integer", + "description" : "Boolean\n * 0 - off\n * 1 - on\n" + }, + "beta" : { + "type" : "number", + "format" : "float" + }, + "symbolSpan" : { + "type" : "integer" + }, "rgbColor" : { "type" : "integer" }, @@ -33469,7 +33545,7 @@ except ApiException as e:
- Generated 2020-09-23T09:56:01.490+02:00 + Generated 2020-09-24T10:53:43.785+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGPacketModSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGPacketModSettings.cpp index 51360b8d7..85ac1f250 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPacketModSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGPacketModSettings.cpp @@ -46,22 +46,68 @@ SWGPacketModSettings::SWGPacketModSettings() { m_repeat_delay_isSet = false; repeat_count = 0; m_repeat_count_isSet = false; + ramp_up_bits = 0; + m_ramp_up_bits_isSet = false; + ramp_down_bits = 0; + m_ramp_down_bits_isSet = false; + ramp_range = 0; + m_ramp_range_isSet = false; + modulate_while_ramping = 0; + m_modulate_while_ramping_isSet = false; + mark_frequency = 0; + m_mark_frequency_isSet = false; + space_frequency = 0; + m_space_frequency_isSet = false; ax25_pre_flags = 0; m_ax25_pre_flags_isSet = false; ax25_post_flags = 0; m_ax25_post_flags_isSet = false; + ax25_control = 0; + m_ax25_control_isSet = false; + ax25_pid = 0; + m_ax25_pid_isSet = false; pre_emphasis = 0; m_pre_emphasis_isSet = false; pre_emphasis_tau = 0.0f; m_pre_emphasis_tau_isSet = false; pre_emphasis_high_freq = 0.0f; m_pre_emphasis_high_freq_isSet = false; + lpf_taps = 0; + m_lpf_taps_isSet = false; + bb_noise = 0; + m_bb_noise_isSet = false; + rf_noise = 0; + m_rf_noise_isSet = false; + write_to_file = 0; + m_write_to_file_isSet = false; + spectrum_rate = 0; + m_spectrum_rate_isSet = false; + callsign = nullptr; + m_callsign_isSet = false; + to = nullptr; + m_to_isSet = false; + via = nullptr; + m_via_isSet = false; + data = nullptr; + m_data_isSet = false; bpf = 0; m_bpf_isSet = false; bpf_low_cutoff = 0.0f; m_bpf_low_cutoff_isSet = false; bpf_high_cutoff = 0.0f; m_bpf_high_cutoff_isSet = false; + bpf_taps = 0; + m_bpf_taps_isSet = false; + scramble = 0; + m_scramble_isSet = false; + polynomial = 0; + m_polynomial_isSet = false; + pulse_shaping = 0; + m_pulse_shaping_isSet = false; + beta = 0.0f; + m_beta_isSet = false; + symbol_span = 0; + m_symbol_span_isSet = false; rgb_color = 0; m_rgb_color_isSet = false; title = nullptr; @@ -104,22 +150,68 @@ SWGPacketModSettings::init() { m_repeat_delay_isSet = false; repeat_count = 0; m_repeat_count_isSet = false; + ramp_up_bits = 0; + m_ramp_up_bits_isSet = false; + ramp_down_bits = 0; + m_ramp_down_bits_isSet = false; + ramp_range = 0; + m_ramp_range_isSet = false; + modulate_while_ramping = 0; + m_modulate_while_ramping_isSet = false; + mark_frequency = 0; + m_mark_frequency_isSet = false; + space_frequency = 0; + m_space_frequency_isSet = false; ax25_pre_flags = 0; m_ax25_pre_flags_isSet = false; ax25_post_flags = 0; m_ax25_post_flags_isSet = false; + ax25_control = 0; + m_ax25_control_isSet = false; + ax25_pid = 0; + m_ax25_pid_isSet = false; pre_emphasis = 0; m_pre_emphasis_isSet = false; pre_emphasis_tau = 0.0f; m_pre_emphasis_tau_isSet = false; pre_emphasis_high_freq = 0.0f; m_pre_emphasis_high_freq_isSet = false; + lpf_taps = 0; + m_lpf_taps_isSet = false; + bb_noise = 0; + m_bb_noise_isSet = false; + rf_noise = 0; + m_rf_noise_isSet = false; + write_to_file = 0; + m_write_to_file_isSet = false; + spectrum_rate = 0; + m_spectrum_rate_isSet = false; + callsign = new QString(""); + m_callsign_isSet = false; + to = new QString(""); + m_to_isSet = false; + via = new QString(""); + m_via_isSet = false; + data = new QString(""); + m_data_isSet = false; bpf = 0; m_bpf_isSet = false; bpf_low_cutoff = 0.0f; m_bpf_low_cutoff_isSet = false; bpf_high_cutoff = 0.0f; m_bpf_high_cutoff_isSet = false; + bpf_taps = 0; + m_bpf_taps_isSet = false; + scramble = 0; + m_scramble_isSet = false; + polynomial = 0; + m_polynomial_isSet = false; + pulse_shaping = 0; + m_pulse_shaping_isSet = false; + beta = 0.0f; + m_beta_isSet = false; + symbol_span = 0; + m_symbol_span_isSet = false; rgb_color = 0; m_rgb_color_isSet = false; title = new QString(""); @@ -160,6 +252,37 @@ SWGPacketModSettings::cleanup() { + + + + + + + + + + if(callsign != nullptr) { + delete callsign; + } + if(to != nullptr) { + delete to; + } + if(via != nullptr) { + delete via; + } + if(data != nullptr) { + delete data; + } + + + + + + + + + + if(title != nullptr) { delete title; } @@ -202,22 +325,68 @@ SWGPacketModSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&repeat_count, pJson["repeatCount"], "qint32", ""); + ::SWGSDRangel::setValue(&ramp_up_bits, pJson["rampUpBits"], "qint32", ""); + + ::SWGSDRangel::setValue(&ramp_down_bits, pJson["rampDownBits"], "qint32", ""); + + ::SWGSDRangel::setValue(&ramp_range, pJson["rampRange"], "qint32", ""); + + ::SWGSDRangel::setValue(&modulate_while_ramping, pJson["modulateWhileRamping"], "qint32", ""); + + ::SWGSDRangel::setValue(&mark_frequency, pJson["markFrequency"], "qint32", ""); + + ::SWGSDRangel::setValue(&space_frequency, pJson["spaceFrequency"], "qint32", ""); + ::SWGSDRangel::setValue(&ax25_pre_flags, pJson["ax25PreFlags"], "qint32", ""); ::SWGSDRangel::setValue(&ax25_post_flags, pJson["ax25PostFlags"], "qint32", ""); + ::SWGSDRangel::setValue(&ax25_control, pJson["ax25Control"], "qint32", ""); + + ::SWGSDRangel::setValue(&ax25_pid, pJson["ax25PID"], "qint32", ""); + ::SWGSDRangel::setValue(&pre_emphasis, pJson["preEmphasis"], "qint32", ""); ::SWGSDRangel::setValue(&pre_emphasis_tau, pJson["preEmphasisTau"], "float", ""); ::SWGSDRangel::setValue(&pre_emphasis_high_freq, pJson["preEmphasisHighFreq"], "float", ""); + ::SWGSDRangel::setValue(&lpf_taps, pJson["lpfTaps"], "qint32", ""); + + ::SWGSDRangel::setValue(&bb_noise, pJson["bbNoise"], "qint32", ""); + + ::SWGSDRangel::setValue(&rf_noise, pJson["rfNoise"], "qint32", ""); + + ::SWGSDRangel::setValue(&write_to_file, pJson["writeToFile"], "qint32", ""); + + ::SWGSDRangel::setValue(&spectrum_rate, pJson["spectrumRate"], "qint32", ""); + + ::SWGSDRangel::setValue(&callsign, pJson["callsign"], "QString", "QString"); + + ::SWGSDRangel::setValue(&to, pJson["to"], "QString", "QString"); + + ::SWGSDRangel::setValue(&via, pJson["via"], "QString", "QString"); + + ::SWGSDRangel::setValue(&data, pJson["data"], "QString", "QString"); + ::SWGSDRangel::setValue(&bpf, pJson["bpf"], "qint32", ""); ::SWGSDRangel::setValue(&bpf_low_cutoff, pJson["bpfLowCutoff"], "float", ""); ::SWGSDRangel::setValue(&bpf_high_cutoff, pJson["bpfHighCutoff"], "float", ""); + ::SWGSDRangel::setValue(&bpf_taps, pJson["bpfTaps"], "qint32", ""); + + ::SWGSDRangel::setValue(&scramble, pJson["scramble"], "qint32", ""); + + ::SWGSDRangel::setValue(&polynomial, pJson["polynomial"], "qint32", ""); + + ::SWGSDRangel::setValue(&pulse_shaping, pJson["pulseShaping"], "qint32", ""); + + ::SWGSDRangel::setValue(&beta, pJson["beta"], "float", ""); + + ::SWGSDRangel::setValue(&symbol_span, pJson["symbolSpan"], "qint32", ""); + ::SWGSDRangel::setValue(&rgb_color, pJson["rgbColor"], "qint32", ""); ::SWGSDRangel::setValue(&title, pJson["title"], "QString", "QString"); @@ -277,12 +446,36 @@ SWGPacketModSettings::asJsonObject() { if(m_repeat_count_isSet){ obj->insert("repeatCount", QJsonValue(repeat_count)); } + if(m_ramp_up_bits_isSet){ + obj->insert("rampUpBits", QJsonValue(ramp_up_bits)); + } + if(m_ramp_down_bits_isSet){ + obj->insert("rampDownBits", QJsonValue(ramp_down_bits)); + } + if(m_ramp_range_isSet){ + obj->insert("rampRange", QJsonValue(ramp_range)); + } + if(m_modulate_while_ramping_isSet){ + obj->insert("modulateWhileRamping", QJsonValue(modulate_while_ramping)); + } + if(m_mark_frequency_isSet){ + obj->insert("markFrequency", QJsonValue(mark_frequency)); + } + if(m_space_frequency_isSet){ + obj->insert("spaceFrequency", QJsonValue(space_frequency)); + } if(m_ax25_pre_flags_isSet){ obj->insert("ax25PreFlags", QJsonValue(ax25_pre_flags)); } if(m_ax25_post_flags_isSet){ obj->insert("ax25PostFlags", QJsonValue(ax25_post_flags)); } + if(m_ax25_control_isSet){ + obj->insert("ax25Control", QJsonValue(ax25_control)); + } + if(m_ax25_pid_isSet){ + obj->insert("ax25PID", QJsonValue(ax25_pid)); + } if(m_pre_emphasis_isSet){ obj->insert("preEmphasis", QJsonValue(pre_emphasis)); } @@ -292,6 +485,33 @@ SWGPacketModSettings::asJsonObject() { if(m_pre_emphasis_high_freq_isSet){ obj->insert("preEmphasisHighFreq", QJsonValue(pre_emphasis_high_freq)); } + if(m_lpf_taps_isSet){ + obj->insert("lpfTaps", QJsonValue(lpf_taps)); + } + if(m_bb_noise_isSet){ + obj->insert("bbNoise", QJsonValue(bb_noise)); + } + if(m_rf_noise_isSet){ + obj->insert("rfNoise", QJsonValue(rf_noise)); + } + if(m_write_to_file_isSet){ + obj->insert("writeToFile", QJsonValue(write_to_file)); + } + if(m_spectrum_rate_isSet){ + obj->insert("spectrumRate", QJsonValue(spectrum_rate)); + } + if(callsign != nullptr && *callsign != QString("")){ + toJsonValue(QString("callsign"), callsign, obj, QString("QString")); + } + if(to != nullptr && *to != QString("")){ + toJsonValue(QString("to"), to, obj, QString("QString")); + } + if(via != nullptr && *via != QString("")){ + toJsonValue(QString("via"), via, obj, QString("QString")); + } + if(data != nullptr && *data != QString("")){ + toJsonValue(QString("data"), data, obj, QString("QString")); + } if(m_bpf_isSet){ obj->insert("bpf", QJsonValue(bpf)); } @@ -301,6 +521,24 @@ SWGPacketModSettings::asJsonObject() { if(m_bpf_high_cutoff_isSet){ obj->insert("bpfHighCutoff", QJsonValue(bpf_high_cutoff)); } + if(m_bpf_taps_isSet){ + obj->insert("bpfTaps", QJsonValue(bpf_taps)); + } + if(m_scramble_isSet){ + obj->insert("scramble", QJsonValue(scramble)); + } + if(m_polynomial_isSet){ + obj->insert("polynomial", QJsonValue(polynomial)); + } + if(m_pulse_shaping_isSet){ + obj->insert("pulseShaping", QJsonValue(pulse_shaping)); + } + if(m_beta_isSet){ + obj->insert("beta", QJsonValue(beta)); + } + if(m_symbol_span_isSet){ + obj->insert("symbolSpan", QJsonValue(symbol_span)); + } if(m_rgb_color_isSet){ obj->insert("rgbColor", QJsonValue(rgb_color)); } @@ -419,6 +657,66 @@ SWGPacketModSettings::setRepeatCount(qint32 repeat_count) { this->m_repeat_count_isSet = true; } +qint32 +SWGPacketModSettings::getRampUpBits() { + return ramp_up_bits; +} +void +SWGPacketModSettings::setRampUpBits(qint32 ramp_up_bits) { + this->ramp_up_bits = ramp_up_bits; + this->m_ramp_up_bits_isSet = true; +} + +qint32 +SWGPacketModSettings::getRampDownBits() { + return ramp_down_bits; +} +void +SWGPacketModSettings::setRampDownBits(qint32 ramp_down_bits) { + this->ramp_down_bits = ramp_down_bits; + this->m_ramp_down_bits_isSet = true; +} + +qint32 +SWGPacketModSettings::getRampRange() { + return ramp_range; +} +void +SWGPacketModSettings::setRampRange(qint32 ramp_range) { + this->ramp_range = ramp_range; + this->m_ramp_range_isSet = true; +} + +qint32 +SWGPacketModSettings::getModulateWhileRamping() { + return modulate_while_ramping; +} +void +SWGPacketModSettings::setModulateWhileRamping(qint32 modulate_while_ramping) { + this->modulate_while_ramping = modulate_while_ramping; + this->m_modulate_while_ramping_isSet = true; +} + +qint32 +SWGPacketModSettings::getMarkFrequency() { + return mark_frequency; +} +void +SWGPacketModSettings::setMarkFrequency(qint32 mark_frequency) { + this->mark_frequency = mark_frequency; + this->m_mark_frequency_isSet = true; +} + +qint32 +SWGPacketModSettings::getSpaceFrequency() { + return space_frequency; +} +void +SWGPacketModSettings::setSpaceFrequency(qint32 space_frequency) { + this->space_frequency = space_frequency; + this->m_space_frequency_isSet = true; +} + qint32 SWGPacketModSettings::getAx25PreFlags() { return ax25_pre_flags; @@ -439,6 +737,26 @@ SWGPacketModSettings::setAx25PostFlags(qint32 ax25_post_flags) { this->m_ax25_post_flags_isSet = true; } +qint32 +SWGPacketModSettings::getAx25Control() { + return ax25_control; +} +void +SWGPacketModSettings::setAx25Control(qint32 ax25_control) { + this->ax25_control = ax25_control; + this->m_ax25_control_isSet = true; +} + +qint32 +SWGPacketModSettings::getAx25Pid() { + return ax25_pid; +} +void +SWGPacketModSettings::setAx25Pid(qint32 ax25_pid) { + this->ax25_pid = ax25_pid; + this->m_ax25_pid_isSet = true; +} + qint32 SWGPacketModSettings::getPreEmphasis() { return pre_emphasis; @@ -469,6 +787,96 @@ SWGPacketModSettings::setPreEmphasisHighFreq(float pre_emphasis_high_freq) { this->m_pre_emphasis_high_freq_isSet = true; } +qint32 +SWGPacketModSettings::getLpfTaps() { + return lpf_taps; +} +void +SWGPacketModSettings::setLpfTaps(qint32 lpf_taps) { + this->lpf_taps = lpf_taps; + this->m_lpf_taps_isSet = true; +} + +qint32 +SWGPacketModSettings::getBbNoise() { + return bb_noise; +} +void +SWGPacketModSettings::setBbNoise(qint32 bb_noise) { + this->bb_noise = bb_noise; + this->m_bb_noise_isSet = true; +} + +qint32 +SWGPacketModSettings::getRfNoise() { + return rf_noise; +} +void +SWGPacketModSettings::setRfNoise(qint32 rf_noise) { + this->rf_noise = rf_noise; + this->m_rf_noise_isSet = true; +} + +qint32 +SWGPacketModSettings::getWriteToFile() { + return write_to_file; +} +void +SWGPacketModSettings::setWriteToFile(qint32 write_to_file) { + this->write_to_file = write_to_file; + this->m_write_to_file_isSet = true; +} + +qint32 +SWGPacketModSettings::getSpectrumRate() { + return spectrum_rate; +} +void +SWGPacketModSettings::setSpectrumRate(qint32 spectrum_rate) { + this->spectrum_rate = spectrum_rate; + this->m_spectrum_rate_isSet = true; +} + +QString* +SWGPacketModSettings::getCallsign() { + return callsign; +} +void +SWGPacketModSettings::setCallsign(QString* callsign) { + this->callsign = callsign; + this->m_callsign_isSet = true; +} + +QString* +SWGPacketModSettings::getTo() { + return to; +} +void +SWGPacketModSettings::setTo(QString* to) { + this->to = to; + this->m_to_isSet = true; +} + +QString* +SWGPacketModSettings::getVia() { + return via; +} +void +SWGPacketModSettings::setVia(QString* via) { + this->via = via; + this->m_via_isSet = true; +} + +QString* +SWGPacketModSettings::getData() { + return data; +} +void +SWGPacketModSettings::setData(QString* data) { + this->data = data; + this->m_data_isSet = true; +} + qint32 SWGPacketModSettings::getBpf() { return bpf; @@ -499,6 +907,66 @@ SWGPacketModSettings::setBpfHighCutoff(float bpf_high_cutoff) { this->m_bpf_high_cutoff_isSet = true; } +qint32 +SWGPacketModSettings::getBpfTaps() { + return bpf_taps; +} +void +SWGPacketModSettings::setBpfTaps(qint32 bpf_taps) { + this->bpf_taps = bpf_taps; + this->m_bpf_taps_isSet = true; +} + +qint32 +SWGPacketModSettings::getScramble() { + return scramble; +} +void +SWGPacketModSettings::setScramble(qint32 scramble) { + this->scramble = scramble; + this->m_scramble_isSet = true; +} + +qint32 +SWGPacketModSettings::getPolynomial() { + return polynomial; +} +void +SWGPacketModSettings::setPolynomial(qint32 polynomial) { + this->polynomial = polynomial; + this->m_polynomial_isSet = true; +} + +qint32 +SWGPacketModSettings::getPulseShaping() { + return pulse_shaping; +} +void +SWGPacketModSettings::setPulseShaping(qint32 pulse_shaping) { + this->pulse_shaping = pulse_shaping; + this->m_pulse_shaping_isSet = true; +} + +float +SWGPacketModSettings::getBeta() { + return beta; +} +void +SWGPacketModSettings::setBeta(float beta) { + this->beta = beta; + this->m_beta_isSet = true; +} + +qint32 +SWGPacketModSettings::getSymbolSpan() { + return symbol_span; +} +void +SWGPacketModSettings::setSymbolSpan(qint32 symbol_span) { + this->symbol_span = symbol_span; + this->m_symbol_span_isSet = true; +} + qint32 SWGPacketModSettings::getRgbColor() { return rgb_color; @@ -611,12 +1079,36 @@ SWGPacketModSettings::isSet(){ if(m_repeat_count_isSet){ isObjectUpdated = true; break; } + if(m_ramp_up_bits_isSet){ + isObjectUpdated = true; break; + } + if(m_ramp_down_bits_isSet){ + isObjectUpdated = true; break; + } + if(m_ramp_range_isSet){ + isObjectUpdated = true; break; + } + if(m_modulate_while_ramping_isSet){ + isObjectUpdated = true; break; + } + if(m_mark_frequency_isSet){ + isObjectUpdated = true; break; + } + if(m_space_frequency_isSet){ + isObjectUpdated = true; break; + } if(m_ax25_pre_flags_isSet){ isObjectUpdated = true; break; } if(m_ax25_post_flags_isSet){ isObjectUpdated = true; break; } + if(m_ax25_control_isSet){ + isObjectUpdated = true; break; + } + if(m_ax25_pid_isSet){ + isObjectUpdated = true; break; + } if(m_pre_emphasis_isSet){ isObjectUpdated = true; break; } @@ -626,6 +1118,33 @@ SWGPacketModSettings::isSet(){ if(m_pre_emphasis_high_freq_isSet){ isObjectUpdated = true; break; } + if(m_lpf_taps_isSet){ + isObjectUpdated = true; break; + } + if(m_bb_noise_isSet){ + isObjectUpdated = true; break; + } + if(m_rf_noise_isSet){ + isObjectUpdated = true; break; + } + if(m_write_to_file_isSet){ + isObjectUpdated = true; break; + } + if(m_spectrum_rate_isSet){ + isObjectUpdated = true; break; + } + if(callsign && *callsign != QString("")){ + isObjectUpdated = true; break; + } + if(to && *to != QString("")){ + isObjectUpdated = true; break; + } + if(via && *via != QString("")){ + isObjectUpdated = true; break; + } + if(data && *data != QString("")){ + isObjectUpdated = true; break; + } if(m_bpf_isSet){ isObjectUpdated = true; break; } @@ -635,6 +1154,24 @@ SWGPacketModSettings::isSet(){ if(m_bpf_high_cutoff_isSet){ isObjectUpdated = true; break; } + if(m_bpf_taps_isSet){ + isObjectUpdated = true; break; + } + if(m_scramble_isSet){ + isObjectUpdated = true; break; + } + if(m_polynomial_isSet){ + isObjectUpdated = true; break; + } + if(m_pulse_shaping_isSet){ + isObjectUpdated = true; break; + } + if(m_beta_isSet){ + isObjectUpdated = true; break; + } + if(m_symbol_span_isSet){ + isObjectUpdated = true; break; + } if(m_rgb_color_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGPacketModSettings.h b/swagger/sdrangel/code/qt5/client/SWGPacketModSettings.h index 35d0fb34f..49c4622b7 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPacketModSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGPacketModSettings.h @@ -69,12 +69,36 @@ public: qint32 getRepeatCount(); void setRepeatCount(qint32 repeat_count); + qint32 getRampUpBits(); + void setRampUpBits(qint32 ramp_up_bits); + + qint32 getRampDownBits(); + void setRampDownBits(qint32 ramp_down_bits); + + qint32 getRampRange(); + void setRampRange(qint32 ramp_range); + + qint32 getModulateWhileRamping(); + void setModulateWhileRamping(qint32 modulate_while_ramping); + + qint32 getMarkFrequency(); + void setMarkFrequency(qint32 mark_frequency); + + qint32 getSpaceFrequency(); + void setSpaceFrequency(qint32 space_frequency); + qint32 getAx25PreFlags(); void setAx25PreFlags(qint32 ax25_pre_flags); qint32 getAx25PostFlags(); void setAx25PostFlags(qint32 ax25_post_flags); + qint32 getAx25Control(); + void setAx25Control(qint32 ax25_control); + + qint32 getAx25Pid(); + void setAx25Pid(qint32 ax25_pid); + qint32 getPreEmphasis(); void setPreEmphasis(qint32 pre_emphasis); @@ -84,6 +108,33 @@ public: float getPreEmphasisHighFreq(); void setPreEmphasisHighFreq(float pre_emphasis_high_freq); + qint32 getLpfTaps(); + void setLpfTaps(qint32 lpf_taps); + + qint32 getBbNoise(); + void setBbNoise(qint32 bb_noise); + + qint32 getRfNoise(); + void setRfNoise(qint32 rf_noise); + + qint32 getWriteToFile(); + void setWriteToFile(qint32 write_to_file); + + qint32 getSpectrumRate(); + void setSpectrumRate(qint32 spectrum_rate); + + QString* getCallsign(); + void setCallsign(QString* callsign); + + QString* getTo(); + void setTo(QString* to); + + QString* getVia(); + void setVia(QString* via); + + QString* getData(); + void setData(QString* data); + qint32 getBpf(); void setBpf(qint32 bpf); @@ -93,6 +144,24 @@ public: float getBpfHighCutoff(); void setBpfHighCutoff(float bpf_high_cutoff); + qint32 getBpfTaps(); + void setBpfTaps(qint32 bpf_taps); + + qint32 getScramble(); + void setScramble(qint32 scramble); + + qint32 getPolynomial(); + void setPolynomial(qint32 polynomial); + + qint32 getPulseShaping(); + void setPulseShaping(qint32 pulse_shaping); + + float getBeta(); + void setBeta(float beta); + + qint32 getSymbolSpan(); + void setSymbolSpan(qint32 symbol_span); + qint32 getRgbColor(); void setRgbColor(qint32 rgb_color); @@ -148,12 +217,36 @@ private: qint32 repeat_count; bool m_repeat_count_isSet; + qint32 ramp_up_bits; + bool m_ramp_up_bits_isSet; + + qint32 ramp_down_bits; + bool m_ramp_down_bits_isSet; + + qint32 ramp_range; + bool m_ramp_range_isSet; + + qint32 modulate_while_ramping; + bool m_modulate_while_ramping_isSet; + + qint32 mark_frequency; + bool m_mark_frequency_isSet; + + qint32 space_frequency; + bool m_space_frequency_isSet; + qint32 ax25_pre_flags; bool m_ax25_pre_flags_isSet; qint32 ax25_post_flags; bool m_ax25_post_flags_isSet; + qint32 ax25_control; + bool m_ax25_control_isSet; + + qint32 ax25_pid; + bool m_ax25_pid_isSet; + qint32 pre_emphasis; bool m_pre_emphasis_isSet; @@ -163,6 +256,33 @@ private: float pre_emphasis_high_freq; bool m_pre_emphasis_high_freq_isSet; + qint32 lpf_taps; + bool m_lpf_taps_isSet; + + qint32 bb_noise; + bool m_bb_noise_isSet; + + qint32 rf_noise; + bool m_rf_noise_isSet; + + qint32 write_to_file; + bool m_write_to_file_isSet; + + qint32 spectrum_rate; + bool m_spectrum_rate_isSet; + + QString* callsign; + bool m_callsign_isSet; + + QString* to; + bool m_to_isSet; + + QString* via; + bool m_via_isSet; + + QString* data; + bool m_data_isSet; + qint32 bpf; bool m_bpf_isSet; @@ -172,6 +292,24 @@ private: float bpf_high_cutoff; bool m_bpf_high_cutoff_isSet; + qint32 bpf_taps; + bool m_bpf_taps_isSet; + + qint32 scramble; + bool m_scramble_isSet; + + qint32 polynomial; + bool m_polynomial_isSet; + + qint32 pulse_shaping; + bool m_pulse_shaping_isSet; + + float beta; + bool m_beta_isSet; + + qint32 symbol_span; + bool m_symbol_span_isSet; + qint32 rgb_color; bool m_rgb_color_isSet;