Restore post signal rsid

* Restored ability to send rsid at end of transmission
pull/1/head
David Freese 2012-07-12 16:45:59 -05:00
rodzic dae167edd4
commit 07d5d89b5e
6 zmienionych plików z 42 dodań i 14 usunięć

Wyświetl plik

@ -3122,6 +3122,13 @@ mode_browser->show(&progdefaults.rsid_tx_modes);
progdefaults.changed = true;
}
Fl_Check_Button *btn_post_rsid=(Fl_Check_Button *)0;
static void cb_btn_post_rsid(Fl_Check_Button* o, void*) {
progdefaults.rsid_post=o->value();
progdefaults.changed = true;
}
Fl_Counter *val_pretone=(Fl_Counter *)0;
static void cb_val_pretone(Fl_Counter* o, void*) {
@ -7210,9 +7217,15 @@ d frequency"));
{ Fl_Group* o = new Fl_Group(340, 198, 253, 85, _("Reed-Solomon ID (Tx)"));
o->box(FL_ENGRAVED_FRAME);
o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE));
{ bRSIDTxModes = new Fl_Button(397, 233, 130, 20, _("Transmit modes"));
{ bRSIDTxModes = new Fl_Button(397, 220, 130, 20, _("Transmit modes"));
bRSIDTxModes->callback((Fl_Callback*)cb_bRSIDTxModes);
} // Fl_Button* bRSIDTxModes
{ Fl_Check_Button* o = btn_post_rsid = new Fl_Check_Button(404, 253, 115, 15, _("End of xmt ID"));
btn_post_rsid->tooltip(_("Add RsID signal to end of transmission"));
btn_post_rsid->down_box(FL_DOWN_BOX);
btn_post_rsid->callback((Fl_Callback*)cb_btn_post_rsid);
o->value(progdefaults.rsid_post);
} // Fl_Check_Button* btn_post_rsid
o->end();
} // Fl_Group* o
{ Fl_Group* o = new Fl_Group(340, 284, 253, 80, _("Pre-Signal Tone"));

Wyświetl plik

@ -88,7 +88,7 @@ decl {\#include "rx_extract.h"} {private local
decl {\#if USE_HAMLIB
\#include "hamlib.h"
\#endif} {selected private local
\#endif} {private local
}
decl {extern void WefaxDestDirSet(Fl_File_Chooser *w, void *userdata);} {private local
@ -123,7 +123,8 @@ for (size_t i = 0; i < sizeof(qrzbweb)/sizeof(*qrzbweb); i++)
qrzbweb[i]->value(b == qrzbweb[i]);} {}
}
Function {ConfigureDialog()} {} {
Function {ConfigureDialog()} {open
} {
code {static const char szShifts[] = "23|85|160|170|182|200|240|350|425|_850|Custom";
static const char szBauds[] = "45|45.45|50|56|75|100|110|150|200|300";
static const char szSelBits[] = "5 (baudot)|7 (ascii)|8 (ascii)";
@ -3725,7 +3726,7 @@ if (o->value()) {
}
}
Fl_Group tabID {
label ID
label ID open
xywh {0 25 598 345} hide
} {
Fl_Group {} {
@ -3896,7 +3897,14 @@ progdefaults.changed = true;}
mode_browser->callback(0);
mode_browser->show(&progdefaults.rsid_tx_modes);
progdefaults.changed = true;}
xywh {397 233 130 20}
xywh {397 220 130 20}
}
Fl_Check_Button btn_post_rsid {
label {End of xmt ID}
callback {progdefaults.rsid_post=o->value();
progdefaults.changed = true;}
tooltip {Add RsID signal to end of transmission} xywh {404 253 115 15} down_box DOWN_BOX
code0 {o->value(progdefaults.rsid_post);}
}
}
Fl_Group {} {

Wyświetl plik

@ -414,6 +414,7 @@ extern Fl_Check_Button *chkRSidNotifyOnly;
extern Fl_Button *bRSIDRxModes;
extern Fl_Value_Slider2 *sldrRSIDsquelch;
extern Fl_Button *bRSIDTxModes;
extern Fl_Check_Button *btn_post_rsid;
extern Fl_Counter *val_pretone;
extern Fl_Group *tabMisc;
extern Fl_Tabs *tabsMisc;

Wyświetl plik

@ -92,7 +92,7 @@
false) \
ELEM_(bool, rsid_auto_disable, "RSIDAUTODISABLE", \
"Disable RSID detection when RsID signal is detected", \
false) \
false) \
ELEM_(bool, rsid_post, "RSIDPOST", \
"Transmit an RSID signal when modem data is concluded", \
false) \

Wyświetl plik

@ -1049,14 +1049,14 @@ void cRsId::send(bool preRSID)
outbuf = new double[symlen];
}
/*
// transmit 6 symbol periods of silence at end of transmission
// transmit 3 symbol periods of silence at end of transmission
if (!preRSID) {
memset(outbuf, 0, symlen * sizeof(*outbuf));
for (int i = 0; i < 6; i++)
for (int i = 0; i < 3; i++)
active_modem->ModulateXmtr(outbuf, symlen);
}
*/
// transmit sequence of 15 symbols (tones)
int iTone;
double freq, phaseincr;
@ -1082,13 +1082,13 @@ void cRsId::send(bool preRSID)
// one symbol period of silence
memset(outbuf, 0, symlen * sizeof(*outbuf));
active_modem->ModulateXmtr(outbuf, symlen);
/*
// transmit 6 symbol periods of silence at beginning of transmission
// transmit 3 symbol periods of silence at beginning of transmission
if (preRSID) {
memset(outbuf, 0, symlen * sizeof(*outbuf));
for (int i = 0; i < 6; i++)
for (int i = 0; i < 3; i++)
active_modem->ModulateXmtr(outbuf, symlen);
}
*/
}

Wyświetl plik

@ -335,6 +335,12 @@ void trx_trx_transmit_loop()
}
}
if ((active_modem != null_modem &&
active_modem != ssb_modem &&
active_modem != wwv_modem ) &&
progdefaults.TransmitRSid &&
progdefaults.rsid_post)
ReedSolomon->send(false);
trx_xmit_wfall_end(current_samplerate);
scard->flush();