now using sql opening value for rgr tone indication, some more debug output

src/svxlink/ChangeLog

@@ -1,6 +1,10 @@
  1.7.0 -- ?? ??? 2018
 ----------------------
 
+* The tone heigh of the roger beep is depending from the signal level of the 
+  last received station. A signal level detector should used for a correct 
+  and meaningfil function.
+
 * Now possible to set the roger sound to be always on in the SimplexLogic, even
   when no module is active. Use the RGR_SOUND_ALWAYS configuration variable to
   enable the feature.

src/svxlink/svxlink/Logic.cpp

@@ -941,7 +941,8 @@ void Logic::squelchOpen(bool is_open)
   }
 
   stringstream ss;
-  ss << "squelch_open " << rx().sqlRxId() << " " << (is_open ? "1" : "0");
+  ss << "squelch_open " << rx().sqlRxId() << " " << (is_open ? "1" : "0")
+     << " " << rx().signalStrength();
   processEvent(ss.str());
 
   if (!is_open)

src/svxlink/svxlink/Logic.tcl

@@ -49,7 +49,12 @@ variable second_tick_subscribers [list];
 #
 # Contains the ID of the last receiver that indicated squelch activity
 #
-variable sql_rx_id "?";
+variable sql_rx_id "0";
+
+#
+# Contains the signal level of the last receiver that indicated squelch activity
+#
+variable sql_level 0;
 
 #
 # Executed when the SvxLink software is started
@@ -183,12 +188,16 @@ proc send_long_ident {hour minute} {
 #
 proc send_rgr_sound {} {
   variable sql_rx_id
+  variable sql_level
+
+  set rgrtone [expr {300 + 3 * int($sql_level)}]
 
   if {$sql_rx_id != "?"} {
     # 150 CPM, 1000 Hz, -4 dBFS
     CW::play $sql_rx_id 150 1000 -4
   } else {
-    playTone 440 500 100
+    playTone $rgrtone 500 100
+    puts "playTone $rgrtone 500 100"
   }
   playSilence 100
 }
@@ -338,10 +347,14 @@ proc transmit {is_on} {
 #   rx_id   - The ID of the RX that the squelch opened/closed on
 #   is_open - Set to 1 if the squelch is open or 0 if it's closed
 #
-proc squelch_open {rx_id is_open} {
+proc squelch_open {rx_id is_open level} {
   variable sql_rx_id;
+  variable sql_level;
   #puts "The squelch is $is_open on RX $rx_id";
   set sql_rx_id $rx_id;
+  if {$is_open == 1} {
+    set sql_level $level;
+  }
 }
 
 

src/versions

@@ -8,7 +8,7 @@ LIBECHOLIB=1.3.3
 LIBASYNC=1.5.99.1
 
 # SvxLink versions
-SVXLINK=1.6.99.8
+SVXLINK=1.6.99.9
 MODULE_HELP=1.0.0
 MODULE_PARROT=1.1.1
 MODULE_ECHOLINK=1.4.99.0