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

Fixed J1Y callsign bug. Added power reporting command

Browse Source
This commit is contained in:
Jordan Sherer 2018-07-25 14:46:21 -04:00
parent 253b60217f
commit d611d83bb9
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mainwindow.cpp
View File

@ -164,7 +164,7 @@ namespace
{ {
Radio::Frequency constexpr default_frequency {14074000}; Radio::Frequency constexpr default_frequency {14074000};
QRegExp message_alphabet {"[- A-Za-z0-9+./?:!^]*"}; QRegExp message_alphabet {"[- A-Za-z0-9+./?:!^]*"};
QRegExp message_input_alphabet {"[- A-Za-z0-9+./?\\n:!^@&|$]*"}; // @&|$ are used for commands but are never transmitted QRegExp message_input_alphabet {"[- A-Za-z0-9+./?\\n:!^@&|$%]*"}; // @&|$% are used for commands but are never transmitted
// grid exact match excluding RR73 // grid exact match excluding RR73
QRegularExpression grid_regexp {"\\A(?![Rr]{2}73)[A-Ra-r]{2}[0-9]{2}([A-Xa-x]{2}){0,1}\\z"}; QRegularExpression grid_regexp {"\\A(?![Rr]{2}73)[A-Ra-r]{2}[0-9]{2}([A-Xa-x]{2}){0,1}\\z"};
@ -7198,6 +7198,19 @@ void MainWindow::buildQueryMenu(QMenu * menu){
toggleTx(true); toggleTx(true);
}); });
auto powerAction = menu->addAction("% - What is your station power?");
powerAction->setDisabled(isAllCall);
connect(powerAction, &QAction::triggered, this, [this](){
QString selectedCall = callsignSelected();
if(selectedCall.isEmpty()){
return;
}
addMessageText(QString("%1%").arg(selectedCall), true);
toggleTx(true);
});
auto heardAction = menu->addAction("$ - What stations are you hearing?"); auto heardAction = menu->addAction("$ - What stations are you hearing?");
heardAction->setDisabled(isAllCall); heardAction->setDisabled(isAllCall);
connect(heardAction, &QAction::triggered, this, [this](){ connect(heardAction, &QAction::triggered, this, [this](){
@ -8625,6 +8638,10 @@ void MainWindow::displayActivity(bool force){
else if(d.cmd == "^" && !isAllCall){ else if(d.cmd == "^" && !isAllCall){
reply = QString("%1 SNR %2").arg(Radio::base_callsign(d.from)).arg(Varicode::formatSNR(d.snr)); reply = QString("%1 SNR %2").arg(Radio::base_callsign(d.from)).arg(Varicode::formatSNR(d.snr));
} }
// QUERIED PWR
else if(d.cmd == "%" && !isAllCall){
reply = QString("%1 PWR %2").arg(Radio::base_callsign(d.from)).arg(Varicode::formatPWR(m_config.my_dBm()));
}
// QUERIED QTH // QUERIED QTH
else if(d.cmd == "@" && !isAllCall){ else if(d.cmd == "@" && !isAllCall){
QString qth = m_config.my_qth(); QString qth = m_config.my_qth();

18
varicode.cpp
View File

@ -30,7 +30,7 @@
const int nalphabet = 41; const int nalphabet = 41;
QString alphabet = {"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ+-./?"}; QString alphabet = {"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ+-./?"};
QString grid_pattern = {R"((?<grid>[A-R]{2}[0-9]{2})+)"}; QString grid_pattern = {R"((?<grid>[A-R]{2}[0-9]{2})+)"};
QString compound_callsign_pattern = {R"((?<callsign>(\d|[A-Z])+\/?((\d|[A-Z]){3,})(\/(\d|[A-Z])+)?(\/(\d|[A-Z])+)?))"}; QString compound_callsign_pattern = {R"((?<callsign>(\d|[A-Z])+\/?((\d|[A-Z]){2,})(\/(\d|[A-Z])+)?(\/(\d|[A-Z])+)?))"};
QString pack_callsign_pattern = {R"(([0-9A-Z ])([0-9A-Z])([0-9])([A-Z ])([A-Z ])([A-Z ]))"}; QString pack_callsign_pattern = {R"(([0-9A-Z ])([0-9A-Z])([0-9])([A-Z ])([A-Z ])([A-Z ]))"};
QString callsign_alphabet = {"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ "}; QString callsign_alphabet = {"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ "};
@ -43,11 +43,11 @@ QMap<QString, int> directed_cmds = {
{"&", 2 }, // query station message {"&", 2 }, // query station message
{"$", 3 }, // query station(s) heard {"$", 3 }, // query station(s) heard
{"^", 4 }, // query snr {"^", 4 }, // query snr
{"%", 5 }, // query pwr
{"|", 6 }, // relay message?
{"!", 7 }, // alert message?
{"|", 5 }, // relay message? // {"/", 8 }, // unused? (can we even use stroke?)
{"!", 6 }, // alert message?
// {"/", 7 }, // unused? (can we even use stroke?)
// directed responses // directed responses
{" ACK", 23 }, // acknowledged {" ACK", 23 }, // acknowledged
@ -61,11 +61,11 @@ QMap<QString, int> directed_cmds = {
{" ", 31 }, // send freetext {" ", 31 }, // send freetext
}; };
QSet<int> allowed_cmds = {0, 1, 2, 3, 4, 5, /*6,*/ 10, 23, 24, 25, 26, 27, 28, 29, 30, 31}; QSet<int> allowed_cmds = {0, 1, 2, 3, 4, 5, 6, /*7,*/ 23, 24, 25, 26, 27, 28, 29, 30, 31};
QRegularExpression directed_re("^" QRegularExpression directed_re("^"
"(?<to>[A-Z0-9/]+)" "(?<to>[A-Z0-9/]+)"
"(?<cmd>\\s?(?:AGN[?]|RR|73|YES|NO|SNR|PWR|ACK|[?@&$^|! ]))" "(?<cmd>\\s?(?:AGN[?]|RR|73|YES|NO|SNR|PWR|ACK|[?@&$^%|! ]))"
"(?<pwr>\\s?\\d+\\s?[KM]?W)?" "(?<pwr>\\s?\\d+\\s?[KM]?W)?"
"(?<num>\\s?[-+]?(?:3[01]|[0-2]?[0-9]))?" "(?<num>\\s?[-+]?(?:3[01]|[0-2]?[0-9]))?"
); );
@ -762,7 +762,7 @@ QString Varicode::packDirectedMessage(const QString &text, const QString &baseCa
QString to = match.captured("to"); QString to = match.captured("to");
QString cmd = match.captured("cmd"); QString cmd = match.captured("cmd");
QString num = match.captured("num").trimmed(); QString num = match.captured("num").trimmed();
QString pwr = match.captured("pwr").trimmed(); QString pwr = match.captured("pwr").trimmed().toUpper();
// validate callsign // validate callsign
bool validToCallsign = (to != baseCallsign) && (basecalls.contains(to) || QRegularExpression(compound_callsign_pattern).match(to).hasMatch()); bool validToCallsign = (to != baseCallsign) && (basecalls.contains(to) || QRegularExpression(compound_callsign_pattern).match(to).hasMatch());
@ -794,7 +794,7 @@ QString Varicode::packDirectedMessage(const QString &text, const QString &baseCa
else if(pwr.endsWith("MW")){ else if(pwr.endsWith("MW")){
factor = 1; factor = 1;
} }
ipwr = pwr.replace(QRegExp("[KM]?W"), "").toInt() * factor; ipwr = pwr.replace(QRegExp("[KM]?W", Qt::CaseInsensitive), "").toInt() * factor;
inum = mwattsToDbm(ipwr) - 30; inum = mwattsToDbm(ipwr) - 30;
} }