fsq sounder/heard-aging

* Increased allowable intervals for both sounder
    and heard-aging
  * Corrected repeated sounder to re-enable retries
    after a successful sounding.
    - sounder will wait until rx/tx state is RX
    - if Rx squelch is open then sounder will retry
      in 10 seconds.  Retry is repeated 10x before
      sounding is rescheduled for next interval.

src/dialogs/confdialog.cxx

@@ -8233,7 +8233,7 @@ i on a\ntouch screen device such as a tablet."));
                 sel_fsq_heard_aging->tooltip(_("Remove call after ..."));
                 sel_fsq_heard_aging->down_box(FL_BORDER_BOX);
                 sel_fsq_heard_aging->callback((Fl_Callback*)cb_sel_fsq_heard_aging);
-                o->add("Never"); o->add("1 min"); o->add("5 min");o->add("10 min"); o->add("20 min"); o->add("20 min");
+                o->add("Never"); o->add("1 min"); o->add("5 min");o->add("10 min"); o->add("20 min"); o->add("20 min"); o->add("30 min"); o->add("60 min"); o->add("90 min"); o->add("120 min");
                 o->value(progdefaults.fsq_heard_aging);
               } // Fl_Choice* sel_fsq_heard_aging
               o->end();
@@ -8273,7 +8273,7 @@ i on a\ntouch screen device such as a tablet."));
                 sel_fsq_sounder->tooltip(_("Send beacon every ..."));
                 sel_fsq_sounder->down_box(FL_BORDER_BOX);
                 sel_fsq_sounder->callback((Fl_Callback*)cb_sel_fsq_sounder);
-                o->add("OFF"); o->add("1 min"); o->add("10 min"); o->add("30 min");
+                o->add("OFF"); o->add("1 min"); o->add("10 min"); o->add("30 min"); o->add("60 min");
                 o->value(progdefaults.fsq_sounder);
               } // Fl_Choice* sel_fsq_sounder
               { Fl_Check_Button* o = btn_fsq_lowercase = new Fl_Check_Button(366, 166, 214, 15, _("MYCALL always lower case"));

src/dialogs/confdialog.fl

@@ -359,7 +359,7 @@ static const char szBaudRates[] = "300|600|1200|2400|4800|9600|19200|38400|57600
 static const char szProsigns[] = "~|%|&|+|=|{|}|<|>|[|]| ";} {}
   Fl_Window {} {
     label {Fldigi configuration} open
-    xywh {677 32 600 415} type Double color 45 selection_color 51 labelsize 18 align 80 non_modal visible
+    xywh {434 227 600 415} type Double color 45 selection_color 51 labelsize 18 align 80 non_modal visible
   } {
     Fl_Tabs tabsConfigure {open
       xywh {0 0 600 380} color 50 selection_color 50
@@ -3475,7 +3475,7 @@ progdefaults.changed = true;}
                 callback {progdefaults.fsq_heard_aging=o->value();
 progdefaults.changed = true;} open
                 tooltip {Remove call after ...} xywh {433 94 102 22} down_box BORDER_BOX
-                code0 {o->add("Never"); o->add("1 min"); o->add("5 min");o->add("10 min"); o->add("20 min"); o->add("20 min");}
+                code0 {o->add("Never"); o->add("1 min"); o->add("5 min");o->add("10 min"); o->add("20 min"); o->add("20 min"); o->add("30 min"); o->add("60 min"); o->add("90 min"); o->add("120 min");}
                 code1 {o->value(progdefaults.fsq_heard_aging);}
               } {}
             }
@@ -3544,7 +3544,7 @@ progdefaults.changed = true;} open
                 callback {progdefaults.fsq_sounder=o->value();
 progdefaults.changed = true;} open
                 tooltip {Send beacon every ...} xywh {80 163 100 22} down_box BORDER_BOX
-                code0 {o->add("OFF"); o->add("1 min"); o->add("10 min"); o->add("30 min");}
+                code0 {o->add("OFF"); o->add("1 min"); o->add("10 min"); o->add("30 min"); o->add("60 min");}
                 code1 {o->value(progdefaults.fsq_sounder);}
               } {}
               Fl_Check_Button btn_fsq_lowercase {

src/dialogs/fl_digi.cxx

@@ -8915,6 +8915,9 @@ void age_heard_list()
 		case 3: aging_secs = 600; break;  // 10 minutes
 		case 4: aging_secs = 1200; break; // 20 minutes
 		case 5: aging_secs = 1800; break; // 30 minutes
+		case 6: aging_secs = 3600; break; // 60 minutes
+		case 7: aging_secs = 5400; break; // 90 minutes
+		case 8: aging_secs = 7200; break; // 120 minutes
 		case 0:
 		default: return; // no aging
 	}

src/fsq/fsq.cxx

@@ -1681,6 +1681,7 @@ void sounder(void *)
 		Fl::repeat_timeout(10, sounder); // retry in 10 seconds
 		return;
 	}
+	sounder_tries = 10;
 	std::string xmtstr = FSQBOL;
 	xmtstr.append(active_modem->fsq_mycall()).append(":").append(FSQEOT);
 	int numsymbols = xmtstr.length();
@@ -1726,6 +1727,7 @@ void fsq::start_sounder(int interval)
 		case 1: sounder_secs = 60; break;   // 1 minute
 		case 2: sounder_secs = 600; break;  // 10 minutes
 		case 3: sounder_secs = 1800; break; // 30 minutes
+		case 4: sounder_secs = 3600; break; // 60 minutes
 		default: sounder_secs = 600;
 	}
 	REQ(fsq_start_sounder);