chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweaked CQ encoding to include CQ FD, dropped CQCQCQ

Browse Source
This commit is contained in:
Jordan Sherer 2019-06-06 14:34:38 -04:00
parent f179c01210
commit 962a94bb87
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Configuration.cpp
View File

@ -1024,7 +1024,7 @@ QString Configuration::my_info() const
QString Configuration::cq_message() const QString Configuration::cq_message() const
{ {
return m_->cq_.trimmed(); return m_->cq_.trimmed().replace("CQCQCQ", "CQ CQ CQ"); // deprecate legacy
} }
QString Configuration::reply_message() const QString Configuration::reply_message() const
@ -1406,7 +1406,7 @@ void Configuration::impl::initialize_models ()
ui_->auto_blacklist_line_edit->setText(auto_blacklist_.join(", ")); ui_->auto_blacklist_line_edit->setText(auto_blacklist_.join(", "));
ui_->eot_line_edit->setText(eot_.trimmed().left(2)); ui_->eot_line_edit->setText(eot_.trimmed().left(2));
ui_->info_message_line_edit->setText (my_info_.toUpper()); ui_->info_message_line_edit->setText (my_info_.toUpper());
ui_->cq_message_line_edit->setText(cq_.toUpper()); ui_->cq_message_line_edit->setText(cq_.toUpper().replace("CQCQCQ", "CQ CQ CQ"));
ui_->reply_message_line_edit->setText (reply_.toUpper()); ui_->reply_message_line_edit->setText (reply_.toUpper());
ui_->use_dynamic_grid->setChecked(use_dynamic_info_); ui_->use_dynamic_grid->setChecked(use_dynamic_info_);
@ -1561,7 +1561,7 @@ void Configuration::impl::read_settings ()
activity_aging_ = settings_->value ("ActivityAging", 2).toInt (); activity_aging_ = settings_->value ("ActivityAging", 2).toInt ();
eot_ = settings_->value("EOTCharacter", QString{"\u2662"}).toString().trimmed().left(2); eot_ = settings_->value("EOTCharacter", QString{"\u2662"}).toString().trimmed().left(2);
my_info_ = settings_->value("MyInfo", QString {}).toString(); my_info_ = settings_->value("MyInfo", QString {}).toString();
cq_ = settings_->value("CQMessage", QString {"CQCQCQ <MYGRID4>"}).toString(); cq_ = settings_->value("CQMessage", QString {"CQ CQ CQ <MYGRID4>"}).toString();
reply_ = settings_->value("Reply", QString {"HW CPY?"}).toString(); reply_ = settings_->value("Reply", QString {"HW CPY?"}).toString();
next_color_cq_ = color_cq_ = settings_->value("colorCQ","#66ff66").toString(); next_color_cq_ = color_cq_ = settings_->value("colorCQ","#66ff66").toString();
next_color_mycall_ = color_mycall_ = settings_->value("colorMyCall","#ff6666").toString(); next_color_mycall_ = color_mycall_ = settings_->value("colorMyCall","#ff6666").toString();

8
varicode.cpp
View File

@ -140,7 +140,7 @@ QRegularExpression directed_re("^" +
optional_cmd_pattern + optional_cmd_pattern +
optional_num_pattern); optional_num_pattern);
QRegularExpression heartbeat_re(R"(^\s*(?<type>CQCQCQ|CQ QRP|CQ FIELD|CQ DX|CQ CONTEST|CQ( CQ){0,2}|HB( AUTO)?( RELAY)?( SPOT)?)(?:\s(?<grid>[A-R]{2}[0-9]{2}))?\b)"); QRegularExpression heartbeat_re(R"(^\s*(?<type>CQ CQ CQ|CQ DX|CQ QRP|CQ CONTEST|CQ FIELD|CQ FD|CQ CQ|CQ|HB( AUTO)?( RELAY)?( SPOT)?)(?:\s(?<grid>[A-R]{2}[0-9]{2}))?\b)");
QRegularExpression compound_re("^\\s*[`]" + QRegularExpression compound_re("^\\s*[`]" +
callsign_pattern + callsign_pattern +
@ -245,14 +245,14 @@ QMap<QString, quint32> basecalls = {
}; };
QMap<quint32, QString> cqs = { QMap<quint32, QString> cqs = {
{ 0, "CQCQCQ" }, { 0, "CQ CQ CQ" },
{ 1, "CQ DX" }, { 1, "CQ DX" },
{ 2, "CQ QRP" }, { 2, "CQ QRP" },
{ 3, "CQ CONTEST" }, { 3, "CQ CONTEST" },
{ 4, "CQ FIELD" }, { 4, "CQ FIELD" },
{ 5, "CQ"}, { 5, "CQ FD"},
{ 6, "CQ CQ"}, { 6, "CQ CQ"},
{ 7, "CQ CQ CQ"}, { 7, "CQ"},
}; };
QMap<quint32, QString> hbs = { QMap<quint32, QString> hbs = {