kopia lustrzana https://github.com/jamescoxon/dl-fldigi
Fix merge: More "why did they do that?"
rodzic
82c4c6ce5c
commit
2ffb3f7411
|
@ -916,6 +916,8 @@ void cb_rtty45(Fl_Widget *w, void *arg)
|
|||
progdefaults.rtty_baud = 1;
|
||||
progdefaults.rtty_bits = 0;
|
||||
progdefaults.rtty_shift = 3;
|
||||
progdefaults.rtty_parity = 0;
|
||||
progdefaults.rtty_stop = 0;
|
||||
set_rtty_tab_widgets();
|
||||
cb_init_mode(w, arg);
|
||||
}
|
||||
|
@ -925,6 +927,8 @@ void cb_rtty50(Fl_Widget *w, void *arg)
|
|||
progdefaults.rtty_baud = 2;
|
||||
progdefaults.rtty_bits = 1;
|
||||
progdefaults.rtty_shift = 6;
|
||||
progdefaults.rtty_parity = 0;
|
||||
progdefaults.rtty_stop = 0;
|
||||
set_rtty_tab_widgets();
|
||||
cb_init_mode(w, arg);
|
||||
}
|
||||
|
@ -935,7 +939,7 @@ void cb_rttyHAB50(Fl_Widget *w, void *arg)
|
|||
progdefaults.rtty_bits = 1;
|
||||
progdefaults.rtty_shift = 8;
|
||||
progdefaults.rtty_parity = 0;
|
||||
progdefaults.rtty_stop = 1;
|
||||
progdefaults.rtty_stop = 0;
|
||||
set_rtty_tab_widgets();
|
||||
cb_init_mode(w, arg);
|
||||
}
|
||||
|
@ -945,6 +949,8 @@ void cb_rtty100(Fl_Widget *w, void *arg)
|
|||
progdefaults.rtty_baud = 5;
|
||||
progdefaults.rtty_bits = 2;
|
||||
progdefaults.rtty_shift = 8;
|
||||
progdefaults.rtty_parity = 0;
|
||||
progdefaults.rtty_stop = 0;
|
||||
set_rtty_tab_widgets();
|
||||
cb_init_mode(w, arg);
|
||||
}
|
||||
|
@ -954,6 +960,8 @@ void cb_rtty300(Fl_Widget *w, void *arg)
|
|||
progdefaults.rtty_baud = 9;
|
||||
progdefaults.rtty_bits = 2;
|
||||
progdefaults.rtty_shift = 10;
|
||||
progdefaults.rtty_parity = 0;
|
||||
progdefaults.rtty_stop = 0;
|
||||
set_rtty_tab_widgets();
|
||||
cb_init_mode(w, arg);
|
||||
}
|
||||
|
|
|
@ -710,19 +710,26 @@ void status::initLastState()
|
|||
loadLastState();
|
||||
|
||||
// RTTY
|
||||
/*
|
||||
dl-fldigi/commit/6762423be66d1f36a8e0d4346fd1b4972fef1bd5
|
||||
|
||||
- Note that i_listbox_xxx objects need indexing offset
|
||||
to maintain compatability with progdefaults definitions.
|
||||
- New objects should use listbox_xxx naming convention
|
||||
*/
|
||||
if (lastmode == MODE_RTTY ) {
|
||||
progdefaults.rtty_shift = rtty_shift;
|
||||
selShift->index(progdefaults.rtty_shift + 1);
|
||||
selShift->index(progdefaults.rtty_shift);
|
||||
if (rtty_shift == selShift->lsize() - 1) {
|
||||
selCustomShift->deactivate();
|
||||
}
|
||||
else { // Custom shift
|
||||
selCustomShift->activate();
|
||||
}
|
||||
selBaud->index((progdefaults.rtty_baud = rtty_baud) + 1);
|
||||
selBits->index((progdefaults.rtty_bits = rtty_bits) + 1);
|
||||
selParity->index((progdefaults.rtty_parity = rtty_parity) + 1);
|
||||
selStopBits->index((progdefaults.rtty_stop = rtty_stop) + 1);
|
||||
selBaud->index(progdefaults.rtty_baud = rtty_baud);
|
||||
selBits->index(progdefaults.rtty_bits = rtty_bits);
|
||||
selParity->index(progdefaults.rtty_parity = rtty_parity);
|
||||
selStopBits->index(progdefaults.rtty_stop = rtty_stop);
|
||||
btnCRCRLF->value(progdefaults.rtty_crcrlf = rtty_crcrlf);
|
||||
btnAUTOCRLF->value(progdefaults.rtty_autocrlf = rtty_autocrlf);
|
||||
cntrAUTOCRLF->value(progdefaults.rtty_autocount = rtty_autocount);
|
||||
|
|
Ładowanie…
Reference in New Issue