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

Added power reply. Added ack reply

Browse Source
This commit is contained in:
Jordan Sherer 2018-07-25 16:51:47 -04:00
parent d611d83bb9
commit 9c9a5c2d8b
2 changed files with 54 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Configuration.cpp
View File

@ -1186,6 +1186,8 @@ void Configuration::impl::initialize_models ()
}; };
ui_->station_power_combo_box->clear(); ui_->station_power_combo_box->clear();
ui_->station_power_combo_box->addItem(QString(""), -1);
foreach(auto dbm, dbm2mw.keys()){ foreach(auto dbm, dbm2mw.keys()){
ui_->station_power_combo_box->addItem(QString("%1 (%2 dBm)").arg(Varicode::formatPWR(dbm)).arg(dbm), dbm); ui_->station_power_combo_box->addItem(QString("%1 (%2 dBm)").arg(Varicode::formatPWR(dbm)).arg(dbm), dbm);
@ -1323,7 +1325,7 @@ void Configuration::impl::read_settings ()
my_callsign_ = settings_->value ("MyCall", QString {}).toString (); my_callsign_ = settings_->value ("MyCall", QString {}).toString ();
my_grid_ = settings_->value ("MyGrid", QString {}).toString (); my_grid_ = settings_->value ("MyGrid", QString {}).toString ();
my_station_ = settings_->value("MyStation", QString {}).toString(); my_station_ = settings_->value("MyStation", QString {}).toString();
my_dBm_ = settings_->value("MyPower", 0).toInt(); my_dBm_ = settings_->value("MyPower", -1).toInt();
callsign_aging_ = settings_->value ("CallsignAging", 0).toInt (); callsign_aging_ = settings_->value ("CallsignAging", 0).toInt ();
activity_aging_ = settings_->value ("ActivityAging", 2).toInt (); activity_aging_ = settings_->value ("ActivityAging", 2).toInt ();
my_qth_ = settings_->value("MyQTH", QString {}).toString(); my_qth_ = settings_->value("MyQTH", QString {}).toString();

71
mainwindow.cpp
View File

@ -7145,10 +7145,25 @@ void MainWindow::buildQueryMenu(QMenu * menu){
toggleTx(true); toggleTx(true);
}); });
auto sendPWRAction = menu->addAction("PWR - Send station power level to the selected callsign");
sendPWRAction->setDisabled(isAllCall || m_config.my_dBm() < 0);
connect(sendPWRAction, &QAction::triggered, this, [this](){
QString selectedCall = callsignSelected();
if(selectedCall.isEmpty()){
return;
}
addMessageText(QString("%1 PWR %2").arg(selectedCall).arg(Varicode::formatPWR(m_config.my_dBm())), true);
// perhaps a better name here?
toggleTx(true);
});
menu->addSeparator(); menu->addSeparator();
auto ackAction = menu->addAction("? - Are you hearing me?"); auto ackQueryAction = menu->addAction("? - Are you hearing me?");
connect(ackAction, &QAction::triggered, this, [this](){ connect(ackQueryAction, &QAction::triggered, this, [this](){
QString selectedCall = callsignSelected(); QString selectedCall = callsignSelected();
if(selectedCall.isEmpty()){ if(selectedCall.isEmpty()){
@ -7159,9 +7174,9 @@ void MainWindow::buildQueryMenu(QMenu * menu){
toggleTx(true); toggleTx(true);
}); });
auto snrAction = menu->addAction("^ - What is my signal report?"); auto snrQueryAction = menu->addAction("^ - What is my signal report?");
snrAction->setDisabled(isAllCall); snrQueryAction->setDisabled(isAllCall);
connect(snrAction, &QAction::triggered, this, [this](){ connect(snrQueryAction, &QAction::triggered, this, [this](){
QString selectedCall = callsignSelected(); QString selectedCall = callsignSelected();
if(selectedCall.isEmpty()){ if(selectedCall.isEmpty()){
@ -7172,9 +7187,9 @@ void MainWindow::buildQueryMenu(QMenu * menu){
toggleTx(true); toggleTx(true);
}); });
auto qthAction = menu->addAction("@ - What is your QTH message?"); auto qthQueryAction = menu->addAction("@ - What is your QTH message?");
qthAction->setDisabled(isAllCall); qthQueryAction->setDisabled(isAllCall);
connect(qthAction, &QAction::triggered, this, [this](){ connect(qthQueryAction, &QAction::triggered, this, [this](){
QString selectedCall = callsignSelected(); QString selectedCall = callsignSelected();
if(selectedCall.isEmpty()){ if(selectedCall.isEmpty()){
@ -7185,9 +7200,9 @@ void MainWindow::buildQueryMenu(QMenu * menu){
toggleTx(true); toggleTx(true);
}); });
auto stationAction = menu->addAction("&& - What is your station message?"); auto stationMessageQueryAction = menu->addAction("&& - What is your station message?");
stationAction->setDisabled(isAllCall); stationMessageQueryAction->setDisabled(isAllCall);
connect(stationAction, &QAction::triggered, this, [this](){ connect(stationMessageQueryAction, &QAction::triggered, this, [this](){
QString selectedCall = callsignSelected(); QString selectedCall = callsignSelected();
if(selectedCall.isEmpty()){ if(selectedCall.isEmpty()){
@ -7198,9 +7213,9 @@ void MainWindow::buildQueryMenu(QMenu * menu){
toggleTx(true); toggleTx(true);
}); });
auto powerAction = menu->addAction("% - What is your station power?"); auto stationPowerQueryAction = menu->addAction("% - What is your station power?");
powerAction->setDisabled(isAllCall); stationPowerQueryAction->setDisabled(isAllCall);
connect(powerAction, &QAction::triggered, this, [this](){ connect(stationPowerQueryAction, &QAction::triggered, this, [this](){
QString selectedCall = callsignSelected(); QString selectedCall = callsignSelected();
if(selectedCall.isEmpty()){ if(selectedCall.isEmpty()){
@ -7211,9 +7226,9 @@ void MainWindow::buildQueryMenu(QMenu * menu){
toggleTx(true); toggleTx(true);
}); });
auto heardAction = menu->addAction("$ - What stations are you hearing?"); auto heardQueryAction = menu->addAction("$ - What stations are you hearing?");
heardAction->setDisabled(isAllCall); heardQueryAction->setDisabled(isAllCall);
connect(heardAction, &QAction::triggered, this, [this](){ connect(heardQueryAction, &QAction::triggered, this, [this](){
QString selectedCall = callsignSelected(); QString selectedCall = callsignSelected();
if(selectedCall.isEmpty()){ if(selectedCall.isEmpty()){
@ -7240,7 +7255,19 @@ void MainWindow::buildQueryMenu(QMenu * menu){
toggleTx(true); toggleTx(true);
}); });
auto rrAction = menu->addAction("RR - I acknowledge your last transmission"); auto ackAction = menu->addAction("ACK - I acknowledge your last transmission");
connect(ackAction, &QAction::triggered, this, [this](){
QString selectedCall = callsignSelected();
if(selectedCall.isEmpty()){
return;
}
addMessageText(QString("%1 ACK").arg(selectedCall), true);
toggleTx(true);
});
auto rrAction = menu->addAction("RR - I received your last transmission");
connect(rrAction, &QAction::triggered, this, [this](){ connect(rrAction, &QAction::triggered, this, [this](){
QString selectedCall = callsignSelected(); QString selectedCall = callsignSelected();
@ -8639,7 +8666,7 @@ void MainWindow::displayActivity(bool force){
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 // QUERIED PWR
else if(d.cmd == "%" && !isAllCall){ else if(d.cmd == "%" && !isAllCall && m_config.my_dBm() >= 0){
reply = QString("%1 PWR %2").arg(Radio::base_callsign(d.from)).arg(Varicode::formatPWR(m_config.my_dBm())); reply = QString("%1 PWR %2").arg(Radio::base_callsign(d.from)).arg(Varicode::formatPWR(m_config.my_dBm()));
} }
// QUERIED QTH // QUERIED QTH
@ -8671,12 +8698,16 @@ void MainWindow::displayActivity(bool force){
QStringList lines; QStringList lines;
foreach(auto call, calls){ foreach(auto call, calls){
if(Radio::base_callsign(call) == Radio::base_callsign(m_config.my_callsign())){
continue;
}
auto d = m_callActivity[call]; auto d = m_callActivity[call];
lines.append(QString("%1 SNR %2").arg(Radio::base_callsign(call)).arg(Varicode::formatSNR(d.snr))); lines.append(QString("%1 SNR %2").arg(Radio::base_callsign(call)).arg(Varicode::formatSNR(d.snr)));
} }
reply = lines.join('\n'); reply = lines.join('\n');
}
} else { if(reply.isEmpty()){
continue; continue;
} }