* All user to select whether flrig PTT change triggers
    RX/TX change in modem stata
pull/4/head
David Freese 2016-02-13 08:59:16 -06:00
rodzic 106e3e2a64
commit 0f650e9ccb
5 zmienionych plików z 50 dodań i 1 usunięć

Wyświetl plik

@ -4324,6 +4324,15 @@ static void cb_mbw_delay(Fl_Counter* o, void*) {
progdefaults.changed=true;
}
Fl_Group *tabFLRIG=(Fl_Group *)0;
Fl_Check_Button *chk_flrig_keys_modem=(Fl_Check_Button *)0;
static void cb_chk_flrig_keys_modem(Fl_Check_Button* o, void*) {
progdefaults.flrig_keys_modem = o->value();
progdefaults.changed = true;
}
Fl_Group *tabSoundCard=(Fl_Group *)0;
Fl_Tabs *tabsSoundCard=(Fl_Tabs *)0;
@ -10189,6 +10198,24 @@ definition"));
} // Fl_Group* o
tabXMLRPC->end();
} // Fl_Group* tabXMLRPC
{ tabFLRIG = new Fl_Group(0, 50, 600, 330, _("flrig"));
tabFLRIG->hide();
{ Fl_Output* o = new Fl_Output(75, 77, 465, 58);
o->tooltip(_("\" \""));
o->type(12);
o->box(FL_BORDER_BOX);
o->color(FL_LIGHT1);
o->align(Fl_Align(FL_ALIGN_CENTER));
o->value(_("Disable this control if multiple instances of fldigi (client)\nare connected to a single flrig (server)."));
} // Fl_Output* o
{ Fl_Check_Button* o = chk_flrig_keys_modem = new Fl_Check_Button(225, 150, 183, 20, _("Flrig PTT keys modem"));
chk_flrig_keys_modem->tooltip(_("\" \""));
chk_flrig_keys_modem->down_box(FL_DOWN_BOX);
chk_flrig_keys_modem->callback((Fl_Callback*)cb_chk_flrig_keys_modem);
o->value(progdefaults.flrig_keys_modem);
} // Fl_Check_Button* chk_flrig_keys_modem
tabFLRIG->end();
} // Fl_Group* tabFLRIG
tabsRig->end();
} // Fl_Tabs* tabsRig
tabRig->end();

Wyświetl plik

@ -5338,6 +5338,22 @@ when both in same macro definition} xywh {210 239 90 21} type Simple align 8 min
}
}
}
Fl_Group tabFLRIG {
label flrig open
xywh {0 50 600 330} hide
} {
Fl_Output {} {
tooltip {" "} xywh {75 77 465 58} type Multiline box BORDER_BOX color 50 align 0
code0 {o->value(_("Disable this control if multiple instances of fldigi (client)\\nare connected to a single flrig (server)."));}
}
Fl_Check_Button chk_flrig_keys_modem {
label {Flrig PTT keys modem}
callback {progdefaults.flrig_keys_modem = o->value();
progdefaults.changed = true;}
tooltip {" "} xywh {225 150 183 20} down_box DOWN_BOX
code0 {o->value(progdefaults.flrig_keys_modem);}
}
}
}
}
Fl_Group tabSoundCard {

Wyświetl plik

@ -508,6 +508,8 @@ extern Fl_Group *grpXMLRPC;
extern Fl_Check_Button *chkUSEXMLRPC;
extern Fl_Button *btnInitXMLRPC;
extern Fl_Counter *mbw_delay;
extern Fl_Group *tabFLRIG;
extern Fl_Check_Button *chk_flrig_keys_modem;
extern Fl_Group *tabSoundCard;
extern Fl_Tabs *tabsSoundCard;
extern Fl_Group *tabAudio;

Wyświetl plik

@ -975,6 +975,10 @@
"Filename for maclogger UDP datastream file", \
"maclogger_udp_strings.txt") \
/* Rig control */ \
ELEM_(bool, flrig_keys_modem, "FLRIG_KEYS_MODEM", \
"PTT change at flrig changes Rx/Tx state\n" \
"set to false if multple instance of fldigi used with single flrig", \
true) \
ELEM_(bool, btnusb, "BTNUSB", \
"This setting is currently unused", \
true) \

Wyświetl plik

@ -937,7 +937,7 @@ void * flrig_thread_loop(void *d)
exec_flrig_ptt();
continue;
}
flrig_get_ptt();
if (progdefaults.flrig_keys_modem) flrig_get_ptt();
if (trx_state == STATE_RX) {
flrig_get_frequency();
flrig_get_smeter();