Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 236caa0

Browse files
jlehJuuso Lehtinen OH2BRG
authored and
Juuso Lehtinen OH2BRG
committed
Add get & set RIG_LEVEL_NB for Yaesu rigs.
Tested with FT-991A Same values applies to FTDX10D, FTDX101MP, FT991A, FTDX101D, FT891
1 parent f08c7d7 commit 236caa0

File tree

5 files changed

+39
-4
lines changed

5 files changed

+39
-4
lines changed

‎rigs/yaesu/ft891.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
RIG_LEVEL_KEYSPD|RIG_LEVEL_AF|RIG_LEVEL_AGC|\
5656
RIG_LEVEL_METER|RIG_LEVEL_BKINDL|RIG_LEVEL_SQL|\
5757
RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|RIG_LEVEL_COMP|\
58-
RIG_LEVEL_ANTIVOX|RIG_LEVEL_NR|RIG_LEVEL_NOTCHF|\
58+
RIG_LEVEL_ANTIVOX|RIG_LEVEL_NR|RIG_LEVEL_NB|RIG_LEVEL_NOTCHF|\
5959
RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_RFPOWER_METER_WATTS|\
6060
RIG_LEVEL_COMP_METER|RIG_LEVEL_ID_METER|\
6161
RIG_LEVEL_BAND_SELECT)

‎rigs/yaesu/ft991.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
RIG_LEVEL_KEYSPD|RIG_LEVEL_AF|RIG_LEVEL_AGC|\
5858
RIG_LEVEL_METER|RIG_LEVEL_BKINDL|RIG_LEVEL_SQL|\
5959
RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|RIG_LEVEL_COMP|\
60-
RIG_LEVEL_ANTIVOX|RIG_LEVEL_NR|RIG_LEVEL_NOTCHF|\
60+
RIG_LEVEL_ANTIVOX|RIG_LEVEL_NR|RIG_LEVEL_NB|RIG_LEVEL_NOTCHF|\
6161
RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_RFPOWER_METER_WATTS|\
6262
RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|\
6363
RIG_LEVEL_BAND_SELECT)

‎rigs/yaesu/ftdx10.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
RIG_LEVEL_KEYSPD|RIG_LEVEL_AF|RIG_LEVEL_AGC|\
5959
RIG_LEVEL_METER|RIG_LEVEL_BKINDL|RIG_LEVEL_SQL|\
6060
RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|RIG_LEVEL_COMP|\
61-
RIG_LEVEL_ANTIVOX|RIG_LEVEL_NR|RIG_LEVEL_NOTCHF|\
61+
RIG_LEVEL_ANTIVOX|RIG_LEVEL_NR|RIG_LEVEL_NB|RIG_LEVEL_NOTCHF|\
6262
RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_RFPOWER_METER_WATTS|\
6363
RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|\
6464
RIG_LEVEL_BAND_SELECT)

‎rigs/yaesu/ftdx101.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
RIG_LEVEL_KEYSPD|RIG_LEVEL_AF|RIG_LEVEL_AGC|\
5858
RIG_LEVEL_METER|RIG_LEVEL_BKINDL|RIG_LEVEL_SQL|\
5959
RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|RIG_LEVEL_COMP|\
60-
RIG_LEVEL_ANTIVOX|RIG_LEVEL_NR|RIG_LEVEL_NOTCHF|\
60+
RIG_LEVEL_ANTIVOX|RIG_LEVEL_NR|RIG_LEVEL_NB|RIG_LEVEL_NOTCHF|\
6161
RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_RFPOWER_METER_WATTS|\
6262
RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|RIG_LEVEL_TEMP_METER|\
6363
RIG_LEVEL_BAND_SELECT)

‎rigs/yaesu/newcat.c‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4382,6 +4382,28 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
43824382
}
43834383
break;
43844384

4385+
case RIG_LEVEL_NB:
4386+
if (!newcat_valid_command(rig, "NL"))
4387+
{
4388+
RETURNFUNC(-RIG_ENAVAIL);
4389+
}
4390+
4391+
fpf = newcat_scale_float(10, val.f);
4392+
4393+
if (fpf < 0)
4394+
{
4395+
fpf = 0;
4396+
}
4397+
4398+
if (fpf > 10)
4399+
{
4400+
fpf = 10;
4401+
}
4402+
4403+
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "NL00%02d%c", fpf, cat_term);
4404+
4405+
break;
4406+
43854407
default:
43864408
RETURNFUNC(-RIG_EINVAL);
43874409
}
@@ -4648,6 +4670,15 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
46484670
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "VG%c", cat_term);
46494671
break;
46504672

4673+
case RIG_LEVEL_NB:
4674+
if (!newcat_valid_command(rig, "NL"))
4675+
{
4676+
RETURNFUNC(-RIG_ENAVAIL);
4677+
}
4678+
4679+
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "NL0%c", cat_term);
4680+
break;
4681+
46514682
/*
46524683
* Read only levels
46534684
*/
@@ -5409,6 +5440,10 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
54095440
val->f = (float)atoi(retlvl) / scale;
54105441
break;
54115442

5443+
case RIG_LEVEL_NB:
5444+
val->f = (float)(atoi(retlvl) / 10.);
5445+
break;
5446+
54125447
default:
54135448
RETURNFUNC(-RIG_EINVAL);
54145449
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /