Browse Source

PSK31Mod: Remove prefixCRLF and postfixCRLF settings as not needed.

chirpmodem-v8.0.0
Jon Beniston 2 months ago
parent
commit
ced84e0a1d
  1. 14
      plugins/channeltx/modpsk31/psk31mod.cpp
  2. 2
      plugins/channeltx/modpsk31/psk31modgui.cpp
  3. 18
      plugins/channeltx/modpsk31/psk31modsettings.cpp
  4. 2
      plugins/channeltx/modpsk31/psk31modsettings.h
  5. 17
      plugins/channeltx/modpsk31/psk31modsource.cpp
  6. 4
      plugins/channeltx/modpsk31/psk31modtxsettingsdialog.cpp
  7. 26
      plugins/channeltx/modpsk31/psk31modtxsettingsdialog.ui
  8. 10
      sdrbase/resources/webapi/doc/swagger/include/PSK31Mod.yaml
  9. 10
      swagger/sdrangel/api/swagger/include/PSK31Mod.yaml
  10. 45
      swagger/sdrangel/code/qt5/client/SWGPSK31ModSettings.cpp
  11. 12
      swagger/sdrangel/code/qt5/client/SWGPSK31ModSettings.h

14
plugins/channeltx/modpsk31/psk31mod.cpp

@ -374,12 +374,6 @@ void PSK31::webapiUpdateChannelSettings( @@ -374,12 +374,6 @@ void PSK31::webapiUpdateChannelSettings(
if (channelSettingsKeys.contains("symbolSpan")) {
settings.m_symbolSpan = response.getPsk31ModSettings()->getSymbolSpan();
}
if (channelSettingsKeys.contains("prefixCRLF")) {
settings.m_prefixCRLF = response.getPsk31ModSettings()->getPrefixCrlf();
}
if (channelSettingsKeys.contains("postfixCRLF")) {
settings.m_postfixCRLF = response.getPsk31ModSettings()->getPostfixCrlf();
}
if (channelSettingsKeys.contains("rgbColor")) {
settings.m_rgbColor = response.getPsk31ModSettings()->getRgbColor();
}
@ -502,8 +496,6 @@ void PSK31::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respons @@ -502,8 +496,6 @@ void PSK31::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respons
response.getPsk31ModSettings()->setBeta(settings.m_beta);
response.getPsk31ModSettings()->setSymbolSpan(settings.m_symbolSpan);
response.getPsk31ModSettings()->setPrefixCrlf(settings.m_prefixCRLF);
response.getPsk31ModSettings()->setPostfixCrlf(settings.m_postfixCRLF);
response.getPsk31ModSettings()->setUdpEnabled(settings.m_udpEnabled);
if (response.getPsk31ModSettings()->getUdpAddress()) {
@ -675,12 +667,6 @@ void PSK31::webapiFormatChannelSettings( @@ -675,12 +667,6 @@ void PSK31::webapiFormatChannelSettings(
if (channelSettingsKeys.contains("symbolSpan")) {
swgPSK31ModSettings->setSymbolSpan(settings.m_symbolSpan);
}
if (channelSettingsKeys.contains("prefixCRLF")) {
swgPSK31ModSettings->setPrefixCrlf(settings.m_prefixCRLF);
}
if (channelSettingsKeys.contains("postfixCRLF")) {
swgPSK31ModSettings->setPostfixCrlf(settings.m_postfixCRLF);
}
if (channelSettingsKeys.contains("rgbColor") || force) {
swgPSK31ModSettings->setRgbColor(settings.m_rgbColor);
}

2
plugins/channeltx/modpsk31/psk31modgui.cpp

@ -477,7 +477,7 @@ void PSK31GUI::displaySettings() @@ -477,7 +477,7 @@ void PSK31GUI::displaySettings()
ui->udpAddress->setText(m_settings.m_udpAddress);
ui->udpPort->setText(QString::number(m_settings.m_udpPort));
ui->gainText->setText(QString("%1dB").arg((double)m_settings.m_gain, 0, 'f', 1));
ui->gainText->setText(QString("%1 dB").arg((double)m_settings.m_gain, 0, 'f', 1));
ui->gain->setValue(m_settings.m_gain);
ui->channelMute->setChecked(m_settings.m_channelMute);

18
plugins/channeltx/modpsk31/psk31modsettings.cpp

@ -41,8 +41,6 @@ void PSK31Settings::resetToDefaults() @@ -41,8 +41,6 @@ void PSK31Settings::resetToDefaults()
m_lpfTaps = 301;
m_rfNoise = false;
m_text = "CQ CQ CQ DE SDRangel CQ";
m_prefixCRLF = true;
m_postfixCRLF = true;
m_predefinedTexts = QStringList({
"CQ CQ CQ DE ${callsign} ${callsign} CQ",
"DE ${callsign} ${callsign} ${callsign}",
@ -82,8 +80,6 @@ QByteArray PSK31Settings::serialize() const @@ -82,8 +80,6 @@ QByteArray PSK31Settings::serialize() const
s.writeBool(25, m_rfNoise);
s.writeString(30, m_text);
s.writeBool(64, m_prefixCRLF);
s.writeBool(65, m_postfixCRLF);
s.writeList(66, m_predefinedTexts);
s.writeU32(31, m_rgbColor);
@ -145,8 +141,6 @@ bool PSK31Settings::deserialize(const QByteArray& data) @@ -145,8 +141,6 @@ bool PSK31Settings::deserialize(const QByteArray& data)
d.readBool(25, &m_rfNoise, false);
d.readString(30, &m_text, "CQ CQ CQ anyone using SDRangel");
d.readBool(64, &m_prefixCRLF, true);
d.readBool(65, &m_postfixCRLF, true);
d.readList(66, &m_predefinedTexts);
d.readU32(31, &m_rgbColor);
@ -247,12 +241,6 @@ void PSK31Settings::applySettings(const QStringList& settingsKeys, const PSK31Se @@ -247,12 +241,6 @@ void PSK31Settings::applySettings(const QStringList& settingsKeys, const PSK31Se
if (settingsKeys.contains("symbolSpan")) {
m_symbolSpan = settings.m_symbolSpan;
}
if (settingsKeys.contains("prefixCRLF")) {
m_prefixCRLF = settings.m_prefixCRLF;
}
if (settingsKeys.contains("postfixCRLF")) {
m_postfixCRLF = settings.m_postfixCRLF;
}
if (settingsKeys.contains("predefinedTexts")) {
m_predefinedTexts = settings.m_predefinedTexts;
}
@ -343,12 +331,6 @@ QString PSK31Settings::getDebugString(const QStringList& settingsKeys, bool forc @@ -343,12 +331,6 @@ QString PSK31Settings::getDebugString(const QStringList& settingsKeys, bool forc
if (settingsKeys.contains("symbolSpan") || force) {
ostr << " m_symbolSpan: " << m_symbolSpan;
}
if (settingsKeys.contains("prefixCRLF") || force) {
ostr << " m_prefixCRLF: " << m_prefixCRLF;
}
if (settingsKeys.contains("postfixCRLF") || force) {
ostr << " m_postfixCRLF: " << m_postfixCRLF;
}
if (settingsKeys.contains("rgbColor") || force) {
ostr << " m_rgbColor: " << m_rgbColor;
}

2
plugins/channeltx/modpsk31/psk31modsettings.h

@ -43,8 +43,6 @@ struct PSK31Settings @@ -43,8 +43,6 @@ struct PSK31Settings
bool m_pulseShaping;
float m_beta;
int m_symbolSpan;
bool m_prefixCRLF;
bool m_postfixCRLF;
QStringList m_predefinedTexts;
quint32 m_rgbColor;

17
plugins/channeltx/modpsk31/psk31modsource.cpp

@ -373,18 +373,15 @@ void PSK31Source::addTXText(QString text) @@ -373,18 +373,15 @@ void PSK31Source::addTXText(QString text)
{
int count = m_settings.m_repeat ? m_settings.m_repeatCount : 1;
for (int i = 0; i < count; i++) {
QString s = text;
// PSK31 defines both CR and LF Varicode characters but no message delimiter.
// Terminate messages with a single LF unless the caller supplied a line ending.
if (!text.endsWith('\r') && !text.endsWith('\n')) {
text.append('\n');
}
if (m_settings.m_prefixCRLF) {
s.prepend("\r\r\n");
}
if (m_settings.m_postfixCRLF) {
s.append("\r\r\n");
}
for (int i = 0; i < count; i++) {
m_textToTransmit.append(s);
m_textToTransmit.append(text);
}
}

4
plugins/channeltx/modpsk31/psk31modtxsettingsdialog.cpp

@ -30,8 +30,6 @@ PSK31TXSettingsDialog::PSK31TXSettingsDialog(PSK31Settings* settings, QWidget *p @@ -30,8 +30,6 @@ PSK31TXSettingsDialog::PSK31TXSettingsDialog(PSK31Settings* settings, QWidget *p
ui(new Ui::PSK31TXSettingsDialog)
{
ui->setupUi(this);
ui->prefixCRLF->setChecked(m_settings->m_prefixCRLF);
ui->postfixCRLF->setChecked(m_settings->m_postfixCRLF);
for (const auto& text : m_settings->m_predefinedTexts) {
ui->predefinedText->addItem(newItem(text));
}
@ -49,8 +47,6 @@ PSK31TXSettingsDialog::~PSK31TXSettingsDialog() @@ -49,8 +47,6 @@ PSK31TXSettingsDialog::~PSK31TXSettingsDialog()
void PSK31TXSettingsDialog::accept()
{
m_settings->m_prefixCRLF = ui->prefixCRLF->isChecked();
m_settings->m_postfixCRLF = ui->postfixCRLF->isChecked();
m_settings->m_predefinedTexts.clear();
for (int i = 0; i < ui->predefinedText->count(); i++) {
m_settings->m_predefinedTexts.append(ui->predefinedText->item(i)->text());

26
plugins/channeltx/modpsk31/psk31modtxsettingsdialog.ui

@ -26,24 +26,14 @@ @@ -26,24 +26,14 @@
<string>Text</string>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="prefixCRLF">
<property name="toolTip">
<string>Prefix text with carriage returns and line feed</string>
</property>
<property name="text">
<string>Prefix CR+CR+LF</string>
</property>
</widget>
</item>
<item row="3" column="0">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Predefined text</string>
</property>
</widget>
</item>
<item row="5" column="0">
<item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QToolButton" name="add">
@ -107,17 +97,7 @@ @@ -107,17 +97,7 @@
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="postfixCRLF">
<property name="toolTip">
<string>Postfix text with carriage returns and line feeds</string>
</property>
<property name="text">
<string>Postfix CR+CR+LF</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<item row="1" column="0" colspan="2">
<widget class="QListWidget" name="predefinedText">
<property name="toolTip">
<string>Predefined text messages

10
sdrbase/resources/webapi/doc/swagger/include/PSK31Mod.yaml

@ -54,16 +54,6 @@ PSK31ModSettings: @@ -54,16 +54,6 @@ PSK31ModSettings:
symbolSpan:
type: integer
description: "Symbol span setting for Psk31 mod."
prefixCRLF:
type: integer
description: "Enable prefix crlf (1 enabled, 0 disabled)."
minimum: 0
maximum: 1
postfixCRLF:
type: integer
description: "Enable postfix crlf (1 enabled, 0 disabled)."
minimum: 0
maximum: 1
udpEnabled:
description: "Whether to receive text to transmit on specified UDP port"
type: integer

10
swagger/sdrangel/api/swagger/include/PSK31Mod.yaml

@ -54,16 +54,6 @@ PSK31ModSettings: @@ -54,16 +54,6 @@ PSK31ModSettings:
symbolSpan:
type: integer
description: "Symbol span setting for Psk31 mod."
prefixCRLF:
type: integer
description: "Enable prefix crlf (1 enabled, 0 disabled)."
minimum: 0
maximum: 1
postfixCRLF:
type: integer
description: "Enable postfix crlf (1 enabled, 0 disabled)."
minimum: 0
maximum: 1
udpEnabled:
description: "Whether to receive text to transmit on specified UDP port"
type: integer

45
swagger/sdrangel/code/qt5/client/SWGPSK31ModSettings.cpp

@ -52,10 +52,6 @@ SWGPSK31ModSettings::SWGPSK31ModSettings() { @@ -52,10 +52,6 @@ SWGPSK31ModSettings::SWGPSK31ModSettings() {
m_beta_isSet = false;
symbol_span = 0;
m_symbol_span_isSet = false;
prefix_crlf = 0;
m_prefix_crlf_isSet = false;
postfix_crlf = 0;
m_postfix_crlf_isSet = false;
udp_enabled = 0;
m_udp_enabled_isSet = false;
udp_address = nullptr;
@ -114,10 +110,6 @@ SWGPSK31ModSettings::init() { @@ -114,10 +110,6 @@ SWGPSK31ModSettings::init() {
m_beta_isSet = false;
symbol_span = 0;
m_symbol_span_isSet = false;
prefix_crlf = 0;
m_prefix_crlf_isSet = false;
postfix_crlf = 0;
m_postfix_crlf_isSet = false;
udp_enabled = 0;
m_udp_enabled_isSet = false;
udp_address = new QString("");
@ -224,10 +216,6 @@ SWGPSK31ModSettings::fromJsonObject(QJsonObject &pJson) { @@ -224,10 +216,6 @@ SWGPSK31ModSettings::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&symbol_span, pJson["symbolSpan"], "qint32", "");
::SWGSDRangel::setValue(&prefix_crlf, pJson["prefixCRLF"], "qint32", "");
::SWGSDRangel::setValue(&postfix_crlf, pJson["postfixCRLF"], "qint32", "");
::SWGSDRangel::setValue(&udp_enabled, pJson["udpEnabled"], "qint32", "");
::SWGSDRangel::setValue(&udp_address, pJson["udpAddress"], "QString", "QString");
@ -306,12 +294,6 @@ SWGPSK31ModSettings::asJsonObject() { @@ -306,12 +294,6 @@ SWGPSK31ModSettings::asJsonObject() {
if(m_symbol_span_isSet){
obj->insert("symbolSpan", QJsonValue(symbol_span));
}
if(m_prefix_crlf_isSet){
obj->insert("prefixCRLF", QJsonValue(prefix_crlf));
}
if(m_postfix_crlf_isSet){
obj->insert("postfixCRLF", QJsonValue(postfix_crlf));
}
if(m_udp_enabled_isSet){
obj->insert("udpEnabled", QJsonValue(udp_enabled));
}
@ -475,26 +457,6 @@ SWGPSK31ModSettings::setSymbolSpan(qint32 symbol_span) { @@ -475,26 +457,6 @@ SWGPSK31ModSettings::setSymbolSpan(qint32 symbol_span) {
this->m_symbol_span_isSet = true;
}
qint32
SWGPSK31ModSettings::getPrefixCrlf() {
return prefix_crlf;
}
void
SWGPSK31ModSettings::setPrefixCrlf(qint32 prefix_crlf) {
this->prefix_crlf = prefix_crlf;
this->m_prefix_crlf_isSet = true;
}
qint32
SWGPSK31ModSettings::getPostfixCrlf() {
return postfix_crlf;
}
void
SWGPSK31ModSettings::setPostfixCrlf(qint32 postfix_crlf) {
this->postfix_crlf = postfix_crlf;
this->m_postfix_crlf_isSet = true;
}
qint32
SWGPSK31ModSettings::getUdpEnabled() {
return udp_enabled;
@ -666,12 +628,6 @@ SWGPSK31ModSettings::isSet(){ @@ -666,12 +628,6 @@ SWGPSK31ModSettings::isSet(){
if(m_symbol_span_isSet){
isObjectUpdated = true; break;
}
if(m_prefix_crlf_isSet){
isObjectUpdated = true; break;
}
if(m_postfix_crlf_isSet){
isObjectUpdated = true; break;
}
if(m_udp_enabled_isSet){
isObjectUpdated = true; break;
}
@ -715,4 +671,3 @@ SWGPSK31ModSettings::isSet(){ @@ -715,4 +671,3 @@ SWGPSK31ModSettings::isSet(){
return isObjectUpdated;
}
}

12
swagger/sdrangel/code/qt5/client/SWGPSK31ModSettings.h

@ -80,12 +80,6 @@ public: @@ -80,12 +80,6 @@ public:
qint32 getSymbolSpan();
void setSymbolSpan(qint32 symbol_span);
qint32 getPrefixCrlf();
void setPrefixCrlf(qint32 prefix_crlf);
qint32 getPostfixCrlf();
void setPostfixCrlf(qint32 postfix_crlf);
qint32 getUdpEnabled();
void setUdpEnabled(qint32 udp_enabled);
@ -165,12 +159,6 @@ private: @@ -165,12 +159,6 @@ private:
qint32 symbol_span;
bool m_symbol_span_isSet;
qint32 prefix_crlf;
bool m_prefix_crlf_isSet;
qint32 postfix_crlf;
bool m_postfix_crlf_isSet;
qint32 udp_enabled;
bool m_udp_enabled_isSet;

Loading…
Cancel
Save