Merge pull request #1008 from PianetaRadio/master

Yaesu newcat RIG_FUNC_CSQL

rigs/yaesu/ft991.c

@@ -207,9 +207,9 @@ const struct rig_caps ft991_caps =
     .tx_range_list1 =     {
         {MHz(1.8), MHz(54), FT991_OTHER_TX_MODES, W(5), W(100), FT991_VFO_ALL, FT991_ANTS, "Operating"},
         {MHz(1.8), MHz(54), FT991_AM_TX_MODES, W(2), W(25), FT991_VFO_ALL, FT991_ANTS, "Operating"}, /* AM class */
-        {MHz(144), MHz(148), FT991_OTHER_TX_MODES, W(5), W(100), FT991_VFO_ALL, FT991_ANTS, "Operating"},
+        {MHz(144), MHz(148), FT991_OTHER_TX_MODES, W(5), W(50), FT991_VFO_ALL, FT991_ANTS, "Operating"},
         {MHz(144), MHz(148), FT991_AM_TX_MODES, W(2), W(25), FT991_VFO_ALL, FT991_ANTS, "Operating"}, /* AM class */
-        {MHz(430), MHz(450), FT991_OTHER_TX_MODES, W(5), W(100), FT991_VFO_ALL, FT991_ANTS, "Operating"},
+        {MHz(430), MHz(450), FT991_OTHER_TX_MODES, W(5), W(50), FT991_VFO_ALL, FT991_ANTS, "Operating"},
         {MHz(430), MHz(450), FT991_AM_TX_MODES, W(2), W(25), FT991_VFO_ALL, FT991_ANTS, "Operating"}, /* AM class */
         RIG_FRNG_END,
     },

rigs/yaesu/ft991.h

@@ -61,7 +61,7 @@
                RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|\
                RIG_LEVEL_BAND_SELECT)
 
-#define FT991_FUNCS (RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_LOCK|\
+#define FT991_FUNCS (RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_CSQL|RIG_FUNC_LOCK|\
                RIG_FUNC_MON|RIG_FUNC_NB|RIG_FUNC_NR|RIG_FUNC_VOX|\
                RIG_FUNC_FBKIN|RIG_FUNC_COMP|RIG_FUNC_ANF|RIG_FUNC_MN|\
                RIG_FUNC_RIT|RIG_FUNC_XIT|\

rigs/yaesu/newcat.c

@@ -5647,6 +5647,22 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
 
         break;
 
+    case RIG_FUNC_CSQL:
+        if (!newcat_valid_command(rig, "CT"))
+        {
+            RETURNFUNC(-RIG_ENAVAIL);
+        }
+
+        SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "CT0%d%c", status ? 3 : 0,
+                 cat_term);
+
+        if (rig->caps->targetable_vfo & RIG_TARGETABLE_TONE)
+        {
+            priv->cmd_str[2] = main_sub_vfo;
+        }
+
+        break;       
+            
     case RIG_FUNC_LOCK:
         if (!newcat_valid_command(rig, "LK"))
         {
@@ -5972,6 +5988,21 @@ int newcat_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
         }
 
         break;
+            
+    case RIG_FUNC_CSQL:
+        if (!newcat_valid_command(rig, "CT"))
+        {
+            RETURNFUNC(-RIG_ENAVAIL);
+        }
+
+        SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "CT0%c", cat_term);
+
+        if (rig->caps->targetable_vfo & RIG_TARGETABLE_TONE)
+        {
+            priv->cmd_str[2] = main_sub_vfo;
+        }
+
+        break;            
 
     case RIG_FUNC_LOCK:
         if (!newcat_valid_command(rig, "LK"))
@@ -6176,6 +6207,10 @@ int newcat_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
     case RIG_FUNC_TSQL:
         *status = (retfunc[0] == '1') ? 1 : 0;
         break;
+            
+    case RIG_FUNC_CSQL:
+        *status = (retfunc[0] == '3') ? 1 : 0;
+        break;            
 
     case RIG_FUNC_TUNER:
         *status = (retfunc[2] == '1') ? 1 : 0;

rigs/yaesu/newcat.h

@@ -50,7 +50,7 @@
 typedef char ncboolean;
 
 /* shared function version */
-#define NEWCAT_VER "20220331"
+#define NEWCAT_VER "20220408"
 
 /* Hopefully large enough for future use, 128 chars plus '\0' */
 #define NEWCAT_DATA_LEN                 129