mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix FTDX101MP RFPOWER to allow 200W 

https://github.com/Hamlib/Hamlib/issues/1396
pull/1441/head
Mike Black W9MDB 2023-11-30 22:32:42 -06:00
rodzic 88c3d9427b
commit f255f6f8d8
2 zmienionych plików z 15 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

21
rigs/yaesu/newcat.c
Wyświetl plik

@ -4046,13 +4046,19 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
} }
if ( is_ftdx3000dm ) /* No separate rig->caps for this rig :-( */ if ( is_ftdx3000dm ) /* No separate rig->caps for this rig :-( */
{ {
fpf = (int)((val.f * 50.0f) + 0.5f); fpf = (int)((val.f * 50.0f) + 0.5f);
} }
else else if (is_ftdx101mp)
{ {
fpf = (int)((val.f / level_info->step.f) + 0.5f ); fpf = (int)((val.f / level_info->step.f) + 0.5f ) * 2;
} if (fpf > 200) fpf = 200;
}
else
{
fpf = (int)((val.f / level_info->step.f) + 0.5f );
}
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "PC%03d%c", fpf, cat_term); SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "PC%03d%c", fpf, cat_term);
break; break;
@ -5634,6 +5640,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_RFPOWER: case RIG_LEVEL_RFPOWER:
case RIG_LEVEL_MONITOR_GAIN: case RIG_LEVEL_MONITOR_GAIN:
val->f = (float)atoi(retlvl) * level_info->step.f; val->f = (float)atoi(retlvl) * level_info->step.f;
if (is_ftdx101mp) val->f /= 2;
break; break;
case RIG_LEVEL_BKINDL: case RIG_LEVEL_BKINDL:

2
rigs/yaesu/newcat.h
Wyświetl plik

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