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

Replace ALLCALL with @ALLCALL

Browse Source
This commit is contained in:
Jordan Sherer 2018-10-27 10:13:34 -04:00
parent 121bb0fdb5
commit 9010fa07c0
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jsc_list.cpp
View File

@ -256665,7 +256665,7 @@ const Tuple JSC::list[262144] = {
{"ALLCOCK", 7, 255496}, {"ALLCOCK", 7, 255496},
{"ALLCLASSIFIEDS", 14, 205858}, {"ALLCLASSIFIEDS", 14, 205858},
{"ALLCHIN", 7, 102391}, {"ALLCHIN", 7, 102391},
{"ALLCALL", 7, 81}, {"@ALLCALL", 7, 81},
{"ALLBUSINESS", 11, 110217}, {"ALLBUSINESS", 11, 110217},
{"ALLBRITTON", 10, 248655}, {"ALLBRITTON", 10, 248655},
{"ALLBRIGHT", 9, 249916}, {"ALLBRIGHT", 9, 249916},

2
jsc_map.cpp
View File

@ -102,7 +102,7 @@ const Tuple JSC::map[262144] = {
{"589", 3, 78}, {"589", 3, 78},
{"579", 3, 79}, {"579", 3, 79},
{"569", 3, 80}, {"569", 3, 80},
{"ALLCALL", 7, 81}, {"@ALLCALL", 7, 81},
{"BEACON", 6, 82}, {"BEACON", 6, 82},
{"CQCQCQ", 6, 83}, {"CQCQCQ", 6, 83},
{"CPY?", 4, 84}, {"CPY?", 4, 84},

24
mainwindow.cpp
View File

@ -1510,7 +1510,7 @@ void MainWindow::initializeDummyData(){
i++; i++;
} }
displayTextForFreq("KN4CRD: ALLCALL? \u2301 ", 42, DriftingDateTime::currentDateTimeUtc().addSecs(-315), true, true, true); displayTextForFreq("KN4CRD: @ALLCALL? \u2301 ", 42, DriftingDateTime::currentDateTimeUtc().addSecs(-315), true, true, true);
displayTextForFreq("J1Y: KN4CRD SNR -05 \u2301 ", 42, DriftingDateTime::currentDateTimeUtc().addSecs(-300), false, true, true); displayTextForFreq("J1Y: KN4CRD SNR -05 \u2301 ", 42, DriftingDateTime::currentDateTimeUtc().addSecs(-300), false, true, true);
displayActivity(true); displayActivity(true);
@ -3672,7 +3672,7 @@ void MainWindow::readFromStdout() //readFromStdout
} else { } else {
// convert BEACON to a directed command and process... // convert BEACON to a directed command and process...
cmd.from = cd.call; cmd.from = cd.call;
cmd.to = "ALLCALL"; cmd.to = "@ALLCALL";
cmd.cmd = " BEACON"; cmd.cmd = " BEACON";
cmd.snr = cd.snr; cmd.snr = cd.snr;
cmd.bits = cd.bits; cmd.bits = cd.bits;
@ -5003,11 +5003,11 @@ void MainWindow::createAllcallTableRows(QTableWidget *table, QString const &sele
} }
count++; count++;
} }
auto item = new QTableWidgetItem(count == 0 ? QString("ALLCALL") : QString("ALLCALL (%1)").arg(count)); auto item = new QTableWidgetItem(count == 0 ? QString("@ALLCALL") : QString("@ALLCALL (%1)").arg(count));
item->setData(Qt::UserRole, QVariant("ALLCALL")); item->setData(Qt::UserRole, QVariant("@ALLCALL"));
table->setItem(table->rowCount() - 1, 0, item); table->setItem(table->rowCount() - 1, 0, item);
table->setSpan(table->rowCount() - 1, 0, 1, table->columnCount()); table->setSpan(table->rowCount() - 1, 0, 1, table->columnCount());
if(selectedCall == "ALLCALL"){ if(selectedCall == "@ALLCALL"){
table->item(table->rowCount()-1, 0)->setSelected(true); table->item(table->rowCount()-1, 0)->setSelected(true);
} }
} }
@ -5642,7 +5642,7 @@ void MainWindow::on_logQSOButton_clicked() //Log QSO button
auto dateTimeQSOOff = DriftingDateTime::currentDateTimeUtc(); auto dateTimeQSOOff = DriftingDateTime::currentDateTimeUtc();
if (dateTimeQSOOff < m_dateTimeQSOOn) dateTimeQSOOff = m_dateTimeQSOOn; if (dateTimeQSOOff < m_dateTimeQSOOn) dateTimeQSOOff = m_dateTimeQSOOn;
QString call=callsignSelected(); QString call=callsignSelected();
if(call == "ALLCALL"){ if(call == "@ALLCALL"){
call = ""; call = "";
} }
QString grid=""; QString grid="";
@ -7093,7 +7093,7 @@ void MainWindow::on_beaconButton_clicked()
void MainWindow::on_selcalButton_clicked(){ void MainWindow::on_selcalButton_clicked(){
if(ui->selcalButton->isChecked()){ if(ui->selcalButton->isChecked()){
if(callsignSelected() == "ALLCALL"){ if(callsignSelected() == "@ALLCALL"){
clearCallsignSelected(); clearCallsignSelected();
} }
if(ui->tableWidgetRXAll->isVisible()){ if(ui->tableWidgetRXAll->isVisible()){
@ -8082,7 +8082,7 @@ bool MainWindow::isMyCallIncluded(const QString &text){
} }
bool MainWindow::isAllCallIncluded(const QString &text){ bool MainWindow::isAllCallIncluded(const QString &text){
return text.contains("ALLCALL"); return text.contains("@ALLCALL");
} }
bool MainWindow::isGroupCallIncluded(const QString &text){ bool MainWindow::isGroupCallIncluded(const QString &text){
@ -8698,7 +8698,7 @@ void MainWindow::processCommandActivity() {
enqueueBeacon(reply); enqueueBeacon(reply);
if(isAllCall){ if(isAllCall){
// since all beacons are technically ALLCALL, let's bump the allcall cache here... // since all beacons are technically @ALLCALL, let's bump the allcall cache here...
m_txAllcallCommandCache.insert(d.from, new QDateTime(now), 5); m_txAllcallCommandCache.insert(d.from, new QDateTime(now), 5);
} }
@ -8736,7 +8736,7 @@ void MainWindow::processCommandActivity() {
enqueueBeacon(reply); enqueueBeacon(reply);
if(isAllCall){ if(isAllCall){
// since all beacons are technically ALLCALL, let's bump the allcall cache here... // since all beacons are technically @ALLCALL, let's bump the allcall cache here...
m_txAllcallCommandCache.insert(d.from, new QDateTime(now), 25); m_txAllcallCommandCache.insert(d.from, new QDateTime(now), 25);
} }
} }
@ -8792,12 +8792,12 @@ void MainWindow::processCommandActivity() {
continue; continue;
} }
// do not queue ALLCALL replies if auto-reply is not checked or it's a beacon reply // do not queue @ALLCALL replies if auto-reply is not checked or it's a beacon reply
if(!ui->autoReplyButton->isChecked() && isAllCall && !d.cmd.contains("BEACON")){ if(!ui->autoReplyButton->isChecked() && isAllCall && !d.cmd.contains("BEACON")){
continue; continue;
} }
// add ALLCALLs to the ALLCALL cache // add @ALLCALLs to the @ALLCALL cache
if(isAllCall){ if(isAllCall){
m_txAllcallCommandCache.insert(d.from, new QDateTime(now), 25); m_txAllcallCommandCache.insert(d.from, new QDateTime(now), 25);
} }

6
varicode.cpp
View File

@ -177,8 +177,8 @@ quint16 nusergrid = nbasegrid + 10;
quint16 nmaxgrid = (1<<15)-1; quint16 nmaxgrid = (1<<15)-1;
QMap<QString, quint32> basecalls = { QMap<QString, quint32> basecalls = {
{ "<....>", nbasecall + 1 }, // incomplete callsign { "<....>", nbasecall + 1 }, // incomplete callsign
{ "ALLCALL", nbasecall + 2 }, { "@ALLCALL", nbasecall + 2 }, // ALLCALL group
}; };
QMap<quint32, QString> cqs = { QMap<quint32, QString> cqs = {
@ -1650,7 +1650,7 @@ QStringList Varicode::buildMessageFrames(
auto calls = Varicode::parseCallsigns(line); auto calls = Varicode::parseCallsigns(line);
bool lineStartsWithBaseCall = ( bool lineStartsWithBaseCall = (
line.startsWith("ALLCALL") || line.startsWith("@ALLCALL") ||
line.startsWith("BEACON") || line.startsWith("BEACON") ||
Varicode::startsWithCQ(line) Varicode::startsWithCQ(line)
); );