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

RX.DIRECTED should be sent for all directed messages that are normally written to the directed log

Browse Source
This commit is contained in:
Jordan Sherer 2020-04-04 22:49:26 -04:00
parent fec7e07d7d
commit 0a119eff6b
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mainwindow.cpp
View File

@ -11013,6 +11013,26 @@ void MainWindow::processCommandActivity() {
// log the text to directed txt log // log the text to directed txt log
writeMsgTxt(text, d.snr); writeMsgTxt(text, d.snr);
// write all directed messages to api
if(canSendNetworkMessage()){
sendNetworkMessage("RX.DIRECTED", text, {
{"_ID", QVariant(-1)},
{"FROM", QVariant(d.from)},
{"TO", QVariant(d.to)},
{"CMD", QVariant(d.cmd)},
{"GRID", QVariant(d.grid)},
{"EXTRA", QVariant(d.extra)},
{"TEXT", QVariant(text)},
{"FREQ", QVariant(d.dial+d.offset)},
{"DIAL", QVariant(d.dial)},
{"OFFSET", QVariant(d.offset)},
{"SNR", QVariant(d.snr)},
{"SPEED", QVariant(d.submode)},
{"TDRIFT", QVariant(d.tdrift)},
{"UTC", QVariant(d.utcTimestamp.toMSecsSinceEpoch())}
});
}
// we're only responding to allcalls if we are participating in the allcall group // we're only responding to allcalls if we are participating in the allcall group
// but, don't avoid for heartbeats...those are technically allcalls but are processed differently // but, don't avoid for heartbeats...those are technically allcalls but are processed differently
if(isAllCall && m_config.avoid_allcall() && d.cmd != " HB" && d.cmd != " HEARTBEAT"){ if(isAllCall && m_config.avoid_allcall() && d.cmd != " HB" && d.cmd != " HEARTBEAT"){
@ -11070,9 +11090,10 @@ void MainWindow::processCommandActivity() {
// log it to the display! // log it to the display!
displayTextForFreq(ad.text, ad.offset, ad.utcTimestamp, false, true, false); displayTextForFreq(ad.text, ad.offset, ad.utcTimestamp, false, true, false);
/*
// and send it to the network in case we want to interact with it from an external app... // and send it to the network in case we want to interact with it from an external app...
if(canSendNetworkMessage()){ if(canSendNetworkMessage()){
sendNetworkMessage("RX.DIRECTED", ad.text, { sendNetworkMessage("RX.DIRECTED.ME", ad.text, {
{"_ID", QVariant(-1)}, {"_ID", QVariant(-1)},
{"FROM", QVariant(d.from)}, {"FROM", QVariant(d.from)},
{"TO", QVariant(d.to)}, {"TO", QVariant(d.to)},
@ -11089,6 +11110,7 @@ void MainWindow::processCommandActivity() {
{"UTC", QVariant(ad.utcTimestamp.toMSecsSinceEpoch())} {"UTC", QVariant(ad.utcTimestamp.toMSecsSinceEpoch())}
}); });
} }
*/
if(!isAllCall){ if(!isAllCall){
// if we've received a message to be displayed, we should bump the repeat buttons... // if we've received a message to be displayed, we should bump the repeat buttons...