From 4a3ed244fe29f7988d4f0b903e7df4971b367d42 Mon Sep 17 00:00:00 2001
From: Chef <chwu@eduroam-ipv4-5-0694.triple-a.uni-kl.de>
Date: Fri, 24 Apr 2020 19:02:49 +0200
Subject: [PATCH] Make CAT over serial line working

---
 radio.c       |  15 ++++
 rigctl.c      | 242 +++++++++++++++++++++++++-------------------------
 rigctl_menu.c |  57 ++++--------
 rigctl_menu.h |   2 +-
 4 files changed, 153 insertions(+), 163 deletions(-)

diff --git a/radio.c b/radio.c
index 8e97e4c..0980512 100644
--- a/radio.c
+++ b/radio.c
@@ -64,6 +64,7 @@
 #include "sliders.h"
 #include "toolbar.h"
 #include "rigctl.h"
+#include "rigctl_menu.h"
 #include "ext.h"
 #ifdef LOCALCW
 #include "iambic.h"
@@ -1182,6 +1183,9 @@ void start_radio() {
 
   if(rigctl_enable) {
     launch_rigctl();
+    if (serial_enable) {
+      launch_serial();
+    }
   }
 
   if(can_transmit) {
@@ -2001,6 +2005,12 @@ g_print("radioRestoreState: %s\n",property_path);
     if(value) rigctl_enable=atoi(value);
     value=getProperty("rigctl_port_base");
     if(value) rigctl_port_base=atoi(value);
+    value=getProperty("rigctl_serial_enable");
+    if (value) serial_enable=atoi(value);
+    value=getProperty("rigctl_serial_baud_rate");
+    if (value) serial_baud_rate=atoi(value);
+    value=getProperty("rigctl_serial_port");
+    if (value) strcpy(ser_port,value);
 
     value=getProperty("adc_0_attenuation");
     if(value) adc_attenuation[0]=atoi(value);
@@ -2335,6 +2345,11 @@ g_print("radioSaveState: %s\n",property_path);
     setProperty("rigctl_enable",value);
     sprintf(value,"%d",rigctl_port_base);
     setProperty("rigctl_port_base",value);
+    sprintf(value,"%d",serial_enable);
+    setProperty("rigctl_serial_enable",value);
+    sprintf(value,"%d",serial_baud_rate);
+    setProperty("rigctl_serial_baud_rate",value);
+    setProperty("rigctl_serial_port",ser_port);
 
     sprintf(value,"%d",display_sequence_errors);
     setProperty("radio.display_sequence_errors",value);
diff --git a/rigctl.c b/rigctl.c
index e55d226..1dadaa1 100644
--- a/rigctl.c
+++ b/rigctl.c
@@ -91,8 +91,6 @@ int rigctl_busy = 0;  // Used to tell rigctl_menu that launch has already occure
 int cat_control;
 
 extern int enable_tx_equalizer;
-//extern int serial_baud_rate;
-//extern int serial_parity;
 
 typedef struct {GMutex m; } GT_MUTEX;
 GT_MUTEX * mutex_a;
@@ -3749,123 +3747,97 @@ void parse_cmd ( char * cmd_input,int len,int client_sock) {
 // 
 
 
-// Serial Port Launch
-int set_interface_attribs (int fd, int speed, int parity)
-{
-        struct termios tty;
-        memset (&tty, 0, sizeof tty);
-        if (tcgetattr (fd, &tty) != 0)
-        {
-                fprintf (stderr,"RIGCTL: Error %d from tcgetattr", errno);
-                return -1;
-        }
+static gpointer serial_server(gpointer data) {
+   //
+   // Do essentially the same as in rigctl_client, except that the data
+   // comes from a serial line
+   //
 
-        cfsetospeed (&tty, speed);
-        cfsetispeed (&tty, speed);
-
-        tty.c_cflag = (tty.c_cflag & ~CSIZE) | CS8;     // 8-bit chars
-        // disable IGNBRK for mismatched speed tests; otherwise receive break
-        // as \000 chars
-        tty.c_iflag &= ~IGNBRK;         // disable break processing
-        tty.c_lflag = 0;                // no signaling chars, no echo,
-                                        // no canonical processing
-        tty.c_oflag = 0;                // no remapping, no delays
-        tty.c_cc[VMIN]  = 0;            // read doesn't block
-        tty.c_cc[VTIME] = 5;            // 0.5 seconds read timeout
-
-        //tty.c_iflag &= ~(IXON | IXOFF | IXANY); // shut off xon/xoff ctrl
-        tty.c_iflag |= (IXON | IXOFF | IXANY); // shut off xon/xoff ctrl
-
-        tty.c_cflag |= (CLOCAL | CREAD);// ignore modem controls,
-                                        // enable reading
-        tty.c_cflag &= ~(PARENB | PARODD);      // shut off parity
-        tty.c_cflag |= parity;
-        tty.c_cflag &= ~CSTOPB;
-        tty.c_cflag &= ~CRTSCTS;
-
-        if (tcsetattr (fd, TCSANOW, &tty) != 0)
-        {
-                fprintf(stderr, "RIGCTL: Error %d from tcsetattr", errno);
-                return -1;
-        }
-        return 0;
-}
+   g_mutex_lock(&mutex_a->m);
+   cat_control++;
+//#ifdef RIGCTL_DEBUG
+   fprintf(stderr,"RIGCTL: CTLA INC cat_contro=%d\n",cat_control);
+//#endif
+   g_mutex_unlock(&mutex_a->m);
+   g_idle_add(ext_vfo_update,NULL);
 
-void set_blocking (int fd, int should_block)
-{
-        struct termios tty;
-        memset (&tty, 0, sizeof tty);
-        if (tcgetattr (fd, &tty) != 0)
-        {
-                fprintf (stderr,"RIGCTL: Error %d from tggetattr\n", errno);
-                return;
+   int save_flag = 0; // Used to concatenate two cmd lines together
+   int semi_number = 0;
+   int i;
+   char * work_ptr;
+   char work_buf[MAXDATASIZE];
+   int numbytes;
+   char  cmd_input[MAXDATASIZE] ;
+   char cmd_save[80];
+   int  errcnt=0;
+
+   //
+   // Setting fd to -1 lets this thread exit
+   //
+   while(fd >= 0) {
+        numbytes = read (fd, cmd_input, MAXDATASIZE);
+        if (numbytes == 0) {
+            usleep(50000);
+            continue;
+        }
+        if (numbytes < 0) {
+            errcnt++;
+            fprintf(stderr,"RIGCTL: serial read error (seq=%d)  (%s)\n", errcnt, strerror(errno));
+            usleep(250000);
+            errcnt++;
+            if (errcnt == 10) break;
+            continue;
         }
-        tty.c_cc[VMIN]  = should_block ? 1 : 0;
-        tty.c_cc[VTIME] = 5;            // 0.5 seconds read timeout
+        errcnt=0;
+        for(i=0;i<numbytes;i++)  { work_buf[i] = cmd_input[i]; }
+        work_buf[i+1] = '\0';
+#ifdef RIGCTL_DEBUG
+        fprintf(stderr,"RIGCTL: RCVD=%s<-\n",work_buf);
+#endif
+        // Need to handle two cases
+        // 1. Command is short, i.e. no semicolon - that will set save_flag=1 and
+        //    read another line..
+        // 2. 1 to N commands per line. Turns out N1MM sends multiple commands per line
 
-        if (tcsetattr (fd, TCSANOW, &tty) != 0)
-                fprintf (stderr,"RIGCTL: error %d setting term attributes\n", errno);
-}
-static gpointer serial_server(gpointer data) {
-     // We're going to Read the Serial port and
-     // when we get data we'll send it to parse_cmd
-     char ser_buf[MAXDATASIZE];
-     char work_buf[MAXDATASIZE];
-     char *p;
-     char *d;
-     char save_buf[MAXDATASIZE] = "";
-     int str_len;
-     cat_control++;
-     while(1) {
-        int num_chars = read (fd, ser_buf, sizeof ser_buf);
-        if( num_chars != 0) {
-           //fprintf(stderr,"RIGCTL: RECEVIED=%s<<\n",ser_buf);
-           strcat(work_buf,ser_buf);
-           strcpy(ser_buf,"");  // Clear away serial buffer
-           p = &work_buf[0]; 
-           while((d=strstr(p,";")) != NULL) {
-                 *d = '\0';
-                 g_mutex_lock(&mutex_b->m);
-                 
-                 g_mutex_unlock(&mutex_b->m);
-                 p = ++d;
-                 //fprintf(stderr,"RIGCTL: STRLEFT=%s\n",p);
-           }
-           strcpy(save_buf,p);
-           for(str_len=0; str_len<=1999; str_len++) {
-             ser_buf[str_len] = '\0';
-             work_buf[str_len] = '\0';
-           }
-           strcpy(work_buf,save_buf);
-           for(str_len=0; str_len<=1999; str_len++) {
-             save_buf[str_len] = '\0';
+        if(save_flag == 0) { // Count the number of semicolons if we aren't already in mode 1.
+          semi_number = 0;
+          for(i=0;i<numbytes;i++) {
+             if(cmd_input[i] == ';') { semi_number++;};
+          }
+        }
+        if((save_flag == 0) && (semi_number == 0)) {
+           cmd_input[numbytes] = '\0';      // Turn it into a C string
+           strcpy(cmd_save,cmd_input);      // And save a copy of it till next time through
+           save_flag = 1;
+        } else if(save_flag == 1) {
+           save_flag = 0;
+           cmd_input[numbytes] = '\0';      // Turn it into a C string
+           strcat(cmd_save,cmd_input);
+           strcpy(cmd_input,cmd_save);      // Cat them together and replace cmd_input
+           numbytes = strlen(cmd_input);
+        }
+        if(save_flag != 1) {
+           work_ptr = strtok(cmd_input,";");
+           while(work_ptr != NULL) {
+               // Lock so only one user goes into this at a time
+               g_mutex_lock(&mutex_b->m);
+               parse_cmd(work_ptr,strlen(work_ptr),client->socket);
+               g_mutex_unlock(&mutex_b->m);
+               work_ptr = strtok(NULL,";");
            }
-/*
-           if(strstr(ser_buf,";") != NULL) {
-              p = strtok(ser_buf,s);
-              fprintf(stderr,"RIGCTL: Tok=%s\n",p);
-              while(p != NULL) {
-                 strcpy(work_buf,p);
-                 g_mutex_lock(&mutex_b->m);
-                 parse_cmd(work_buf,strlen(work_buf),-1);
-                 g_mutex_unlock(&mutex_b->m);
-                 p = strtok(NULL,s);
-                 fprintf(stderr,"RIGCTL: Tok=%s\n",p);
-              }
-           } else {
-               strcat(work_buf,ser_buf);
-               fprintf(stderr,"RIGCTL: Work_buf=%s\n",work_buf);
+           for(i=0;i<MAXDATASIZE;i++){
+                cmd_input[i] = '\0';
+                work_buf[i]  = '\0';  // Clear the input buffer
            }
-*/
-        } /*else {
-           usleep(100L);
-        }*/
-     }
+        }
+   }
+   fprintf(stderr,"RIGCTL: terminating serial thread\n");
+   return NULL;
 }
 
 int launch_serial () {
-     fprintf(stderr,"RIGCTL: Launch Serial port %s\n",ser_port);
-
+     struct termios TTY;
+     fprintf(stderr,"RIGCTL: Launch RigCtl server on serial port %s\n",ser_port);
 
      if(mutex_b_exists == 0) {
         mutex_b = g_new(GT_MUTEX,1);
@@ -3873,37 +3845,65 @@ int launch_serial () {
         mutex_b_exists = 1;
      }
      
-     fd = open (ser_port, O_RDWR | O_NOCTTY | O_SYNC);   
+     fd = open (ser_port, O_RDWR | O_NOCTTY | O_NONBLOCK);
      if (fd < 0)
      {
         fprintf (stderr,"RIGCTL: Error %d opening %s: %s\n", errno, ser_port, strerror (errno));
         return 0 ;
      }
-     //set_interface_attribs (fd, B38400, 0);  // set speed to 115,200 bps, 8n1 (no parity)
-     set_interface_attribs (fd, serial_baud_rate, 0); 
-     /*
-     if(serial_parity == 1) {
-         set_interface_attribs (fd, PARENB, 0); 
+
+     tcflush(fd, TCIFLUSH);
+     if (tcgetattr(fd, &TTY)) {
+        fprintf (stderr,"RIGCTL: Error %d getting attributes: %s: %s\n", errno, ser_port, strerror (errno));
+        close (fd);
+        return 0;
      }
-     if(serial_parity == 2) {
-         set_interface_attribs (fd, PARODD, 0); 
+
+     TTY.c_cflag &= ~CSIZE;
+     TTY.c_cflag |= CS8;
+     // enable receiver, set local mode
+     TTY.c_cflag |= (CLOCAL | CREAD);
+     // no parity
+     TTY.c_cflag &= ~PARENB;
+     // 1 stop bit
+     TTY.c_cflag &= ~CSTOPB;
+
+     cfsetispeed(&TTY, serial_baud_rate);
+     cfsetospeed(&TTY, serial_baud_rate);
+
+     // raw input
+     TTY.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG);
+     // raw output
+     TTY.c_oflag &= ~OPOST;
+
+     // timeouts
+     TTY.c_cc[VMIN] = 0;
+     TTY.c_cc[VTIME] =5;
+
+     if (tcsetattr(fd, TCSANOW, &TTY)) {
+        fprintf (stderr,"RIGCTL: Error %d setting attributes: %s: %s\n", errno, ser_port, strerror (errno));
+        close(fd);
+        return 0;
      }
-     */
-     set_blocking (fd, 1);                   // set no blocking
 
-     
      serial_server_thread_id = g_thread_new( "Serial server", serial_server, NULL);
      if( ! serial_server_thread_id )
      {
        fprintf(stderr,"g_thread_new failed on serial_server\n");
+       close(fd);
        return 0;
      }
      return 1;
 }
+
 // Serial Port close
 void disable_serial () {
      fprintf(stderr,"RIGCTL: Disable Serial port %s\n",ser_port);
+     g_mutex_lock(&mutex_a->m);
      cat_control--;
+     g_mutex_unlock(&mutex_a->m);
+     close(fd);
+     fd=-1;
 }
 
 //
diff --git a/rigctl_menu.c b/rigctl_menu.c
index de45624..7227262 100644
--- a/rigctl_menu.c
+++ b/rigctl_menu.c
@@ -35,7 +35,6 @@
 int  serial_enable;
 char ser_port[64]="/dev/ttyUSB0";
 int serial_baud_rate = B4800;
-int serial_parity = 0; // 0=none, 1=even, 2=odd
 
 static GtkWidget *parent_window=NULL;
 
@@ -65,9 +64,12 @@ static void rigctl_value_changed_cb(GtkWidget *widget, gpointer data) {
    rigctl_port_base = gtk_spin_button_get_value(GTK_SPIN_BUTTON(widget)); 
 }
 
-static void serial_value_changed_cb(GtkWidget *widget, gpointer data) {
-     sprintf(ser_port,"/dev/ttyUSB%0d",(int) gtk_spin_button_get_value(GTK_SPIN_BUTTON(widget))); 
-     fprintf(stderr,"RIGCTL_MENU: New Serial port=%s\n",ser_port);
+static void ser_port_cb(GtkWidget *widget, gpointer data) {
+  const gchar *text;
+  text=gtk_entry_get_text(GTK_ENTRY(widget));
+  strncpy(ser_port, text,63);
+  ser_port[63]=0;
+  fprintf(stderr,"Serial port changed to -->%s<--\n",ser_port);
 }
 
 static void rigctl_enable_cb(GtkWidget *widget, gpointer data) {
@@ -96,12 +98,6 @@ static void baud_rate_cb(GtkWidget *widget, gpointer data) {
    fprintf(stderr,"RIGCTL_MENU: Baud rate changed\n");
 }
 
-// Set Parity 0=None, 1=Even, 2=0dd
-static void parity_cb(GtkWidget *widget, gpointer data) {
-   serial_parity = GPOINTER_TO_INT(data);
-   fprintf(stderr,"RITCTL_MENU: Serial Parity changed=%d\n", serial_parity);
-}
-
 void rigctl_menu(GtkWidget *parent) {
   parent_window=parent;
 
@@ -159,14 +155,18 @@ void rigctl_menu(GtkWidget *parent) {
   g_signal_connect(serial_enable_b,"toggled",G_CALLBACK(serial_enable_cb),NULL);
 
   GtkWidget *serial_text_label=gtk_label_new(NULL);
-  gtk_label_set_markup(GTK_LABEL(serial_text_label), "<b>Serial Port: /dev/ttyUSB</b>");
+  gtk_label_set_markup(GTK_LABEL(serial_text_label), "<b>Serial Port:</b>");
   gtk_grid_attach(GTK_GRID(grid),serial_text_label,0,4,1,1);
 
-  GtkWidget *serial_port_spinner =gtk_spin_button_new_with_range(0,7,1);
-  gtk_spin_button_set_value(GTK_SPIN_BUTTON(serial_port_spinner),(double)0);
-  gtk_widget_show(serial_port_spinner);
-  gtk_grid_attach(GTK_GRID(grid),serial_port_spinner,1,4,1,1);
-  g_signal_connect(serial_port_spinner,"value_changed",G_CALLBACK(serial_value_changed_cb),NULL);
+//
+// Serial ports may have other names than /dev/ttyUSBn,
+// e.g. if you wish to use device-specific names from /dev/serial/by-id
+//
+  GtkWidget *ser_port_chooser=gtk_entry_new();
+  gtk_entry_set_text(GTK_ENTRY(ser_port_chooser),ser_port);
+  gtk_grid_attach(GTK_GRID(grid),ser_port_chooser,1,4,4,1);
+  gtk_entry_set_width_chars(GTK_ENTRY(ser_port_chooser), 64);
+  g_signal_connect(ser_port_chooser, "activate", G_CALLBACK(ser_port_cb), NULL);
 
   // Serial baud rate here
   GtkWidget *baud_rate_label =gtk_label_new(NULL);
@@ -198,31 +198,6 @@ void rigctl_menu(GtkWidget *parent) {
   gtk_grid_attach(GTK_GRID(grid),baud_rate_b38400,4,5,1,1);
   g_signal_connect(baud_rate_b38400,"toggled",G_CALLBACK(baud_rate_cb),(gpointer *) B38400);
 
-  // Serial parity
-/*
-  GtkWidget *parity_label =gtk_label_new("Parity:");
-  gtk_widget_show(parity_label);
-  gtk_grid_attach(GTK_GRID(grid),parity_label,0,6,1,1);
-  
-  GtkWidget *parity_none_b=gtk_radio_button_new_with_label(NULL,"None");
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (parity_none_b), serial_parity == 0);
-  gtk_widget_show(parity_none_b);
-  gtk_grid_attach(GTK_GRID(grid),parity_none_b,1,6,1,1);
-  g_signal_connect(parity_none_b,"toggled",G_CALLBACK(parity_cb),(gpointer *) 0);
-
-  GtkWidget *parity_even_b=gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(parity_none_b),"Even");
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (parity_even_b), serial_parity == 1);
-  gtk_widget_show(parity_even_b);
-  gtk_grid_attach(GTK_GRID(grid),parity_even_b,2,6,1,1);
-  g_signal_connect(parity_even_b,"toggled",G_CALLBACK(parity_cb),(gpointer *) 1);
-
-  GtkWidget *parity_odd_b=gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(parity_even_b),"Odd");
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (parity_odd_b), serial_parity == 2);
-  gtk_widget_show(parity_odd_b);
-  gtk_grid_attach(GTK_GRID(grid),parity_odd_b,3,6,1,1);
-  g_signal_connect(parity_odd_b,"toggled",G_CALLBACK(parity_cb),(gpointer *) 1);
-*/
-
   // Below stays put
   gtk_container_add(GTK_CONTAINER(content),grid);
 
diff --git a/rigctl_menu.h b/rigctl_menu.h
index bfb2719..cd954e9 100644
--- a/rigctl_menu.h
+++ b/rigctl_menu.h
@@ -28,4 +28,4 @@ extern void disable_rigctl();
 extern void disable_serial();
 
 extern int serial_baud_rate;
-extern int serial_parity;
+extern int serial_enable;
-- 
2.45.2