From 985627eb1efa371877ce595304624400f5a717ff Mon Sep 17 00:00:00 2001
From: c vw <dl1ycf@darc.de>
Date: Mon, 25 May 2020 14:36:36 +0200
Subject: [PATCH] Finalized manual merge

---
 new_protocol.c | 15 +++++++--------
 radio_menu.c   |  5 ++++-
 rigctl.c       | 25 ++-----------------------
 tx_menu.c      |  2 +-
 4 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/new_protocol.c b/new_protocol.c
index 9ee12db..6341f5f 100644
--- a/new_protocol.c
+++ b/new_protocol.c
@@ -202,14 +202,14 @@ static socklen_t length=sizeof(addr);
 
 
 //
-// We used to allocate (malloc) and free (free) the buffers for the
-// network traffic at a very high rate, this may be a problem on
-// some systems. In fact, only a handful of buffers are actually used.
+// Instead of allocating and free-ing (malloc/free) the network buffers
+// at a very high rate, we do it the "pedestrian" way, which may
+// alleviate the system load a little.
 //
-// Therefore we now allocate a pool of network buffers *once*, make 
+// Therefore we allocate a pool of network buffers *once*, make 
 // them a linked list, and simply maintain a "free" flag.
 //
-// This only applies to the network buffers filled with data in
+// This ONLY applies to the network buffers filled with data in
 // new_protocol_thread(), so this need not be thread-safe.
 //
 
@@ -292,7 +292,7 @@ static void  process_mic_data(int bytes);
 // 5 new ones. Note these buffer "live" as long as the
 // program lives. They are never free()d.
 //
-static mybuffer *free_buffer() {
+static mybuffer *get_my_buffer() {
   int i;
   mybuffer *bp=buflist;
   while (bp) {
@@ -1430,7 +1430,6 @@ void new_protocol_stop() {
 void new_protocol_restart() {
   fd_set fds;
   struct timeval tv;
-  mybuffer *bp;
   char *buffer;
   //
   // halt the protocol, wait 200 msec, and re-start it
@@ -1504,7 +1503,7 @@ g_print("new_protocol_thread\n");
 
     while(running) {
 
-        mybuf=free_buffer();
+        mybuf=get_my_buffer();
         buffer=mybuf->buffer;
         bytesread=recvfrom(data_socket,buffer,NET_BUFFER_SIZE,0,(struct sockaddr*)&addr,&length);
 
diff --git a/radio_menu.c b/radio_menu.c
index 4d523cd..4857e37 100644
--- a/radio_menu.c
+++ b/radio_menu.c
@@ -288,7 +288,10 @@ void load_filters(void) {
     filter_board_changed();
   }
 
-  if(filter_board==ALEX || filter_board==APOLLO) {
+  //
+  // This should not be necessary HERE
+  //
+  if(filter_board==ALEX || filter_board==APOLLO || filter_board==CHARLY25) {
       set_alex_rx_antenna();
       set_alex_tx_antenna();
       set_alex_attenuation();
diff --git a/rigctl.c b/rigctl.c
index b6726e3..2158bfd 100644
--- a/rigctl.c
+++ b/rigctl.c
@@ -424,9 +424,6 @@ static gpointer rigctl_cw_thread(gpointer data)
       continue;
     }
 
-    if (rigctl_debug && cw_busy) {
-      g_print("SendCW: -->%s<--\n", cw_buf);
-    }
     //
     // if a message arrives and the TX mode is not CW, silently ignore
     //
@@ -2578,26 +2575,6 @@ int parse_cmd(void *data) {
           // set/read Auto Mode Function Parameters
           implemented=FALSE;
           break;
-        case 'I': //AI
-          // set/read Auto Information
-          implemented=FALSE;
-          break;
-        case 'L': // AL
-          // set/read Auto Notch level
-          implemented=FALSE;
-          break;
-        case 'M': // AM
-          // set/read Auto Mode
-          implemented=FALSE;
-          break;
-        case 'N': // AN
-          // set/read Antenna Connection
-          implemented=FALSE;
-          break;
-        case 'S': // AS
-          // set/read Auto Mode Function Parameters
-          implemented=FALSE;
-          break;
         default:
           implemented=FALSE;
           break;
@@ -2943,6 +2920,8 @@ int parse_cmd(void *data) {
           } else if(command[27]==';') {
             if(cw_busy==0) {
               strncpy(cw_buf,&command[3],24);
+              // if command is too long, strncpy does not terminate destination
+              cw_buf[24]='\0';
               cw_busy=1;
             }
           } else {
diff --git a/tx_menu.c b/tx_menu.c
index a025cc2..1337786 100644
--- a/tx_menu.c
+++ b/tx_menu.c
@@ -509,8 +509,8 @@ void tx_menu(GtkWidget *parent) {
   for(i=0;i<CTCSS_FREQUENCIES;i++) {
     sprintf(temp,"%0.1f",ctcss_frequencies[i]);
     gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(ctcss_frequency_b),NULL,temp);
-    gtk_combo_box_set_active(GTK_COMBO_BOX(ctcss_frequency_b),transmitter->ctcss==i);
   }
+  gtk_combo_box_set_active(GTK_COMBO_BOX(ctcss_frequency_b),transmitter->ctcss);
   gtk_grid_attach(GTK_GRID(grid),ctcss_frequency_b,col,row,1,1);
   g_signal_connect(ctcss_frequency_b,"changed",G_CALLBACK(ctcss_frequency_cb),NULL);
 
-- 
2.45.2