Merge pull request #1166 from PianetaRadio/master

Yaesu NB2

rigs/yaesu/ft950.h

@@ -64,7 +64,7 @@
                RIG_LEVEL_BAND_SELECT)
 
 #define FT950_FUNCS (RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_LOCK|\
-               RIG_FUNC_MON|RIG_FUNC_NB|RIG_FUNC_NR|RIG_FUNC_VOX|\
+               RIG_FUNC_MON|RIG_FUNC_NB|RIG_FUNC_NB2|RIG_FUNC_NR|RIG_FUNC_VOX|\
                RIG_FUNC_FBKIN|RIG_FUNC_COMP|RIG_FUNC_ANF|RIG_FUNC_MN|\
                RIG_FUNC_RIT|RIG_FUNC_XIT|\
                RIG_FUNC_TUNER)

rigs/yaesu/newcat.c

@@ -5870,6 +5870,22 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
 
         break;
             
+    case RIG_FUNC_NB2:
+        if (!newcat_valid_command(rig, "NB"))
+        {
+            RETURNFUNC(-RIG_ENAVAIL);
+        }
+            
+        SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "NB0%d%c", status ? 2 : 0,
+                 cat_term);
+        
+        if (rig->caps->targetable_vfo & RIG_TARGETABLE_MODE)
+        {
+            priv->cmd_str[2] = main_sub_vfo;
+        }
+
+        break;
+
     case RIG_FUNC_NR:
     {
         pbwidth_t width;
@@ -6183,6 +6199,7 @@ int newcat_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
         break;
 
     case RIG_FUNC_NB:
+    case RIG_FUNC_NB2:
         if (!newcat_valid_command(rig, "NB"))
         {
             RETURNFUNC(-RIG_ENAVAIL);
@@ -6354,12 +6371,19 @@ int newcat_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
 
     case RIG_FUNC_ANF:
     case RIG_FUNC_FBKIN:
-    case RIG_FUNC_NB:
     case RIG_FUNC_NR:
     case RIG_FUNC_VOX:
         *status = (retfunc[0] == '0') ? 0 : 1;
         break;
             
+    case RIG_FUNC_NB:
+        *status = (retfunc[0] == '1') ? 1 : 0;
+        break; 
+            
+    case RIG_FUNC_NB2:
+        *status = (retfunc[0] == '2') ? 1 : 0;
+        break;
+
     case RIG_FUNC_TONE:
         *status = (retfunc[0] == '2') ? 1 : 0;
         break;