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

Make TS570 KEYSPD patch apply to TS570S too 

Fix the TS570 KEYSPD get_level to return the correct value
https://github.com/Hamlib/Hamlib/issues/840
pull/846/head
Mike Black W9MDB 2021-10-25 07:13:38 -05:00
rodzic ff1d2bab83
commit 5f9153cd0a
2 zmienionych plików z 10 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -3673,7 +3673,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
}
// Firmware bug in TS570D has to adjust keyer speed
// At this point not sure which value is correct so we'll assume the requested rate is correct
if (rig->caps->rig_model == RIG_MODEL_TS570D)
if (rig->caps->rig_model == RIG_MODEL_TS570D || rig->caps->rig_model == RIG_MODEL_TS570S)
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "KS%03d%c", (val.i-10)*2, cat_term);
}
@ -5050,7 +5050,14 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_RAWSTR:
case RIG_LEVEL_KEYSPD:
val->i = atoi(retlvl);
if (rig->caps->rig_model == RIG_MODEL_TS570D || rig->caps->rig_model == RIG_MODEL_TS570S)
{ // TS570 uses 010-~060 scale according to manual
val->i = atoi(retlvl)/2 + 10;
}
else
{
val->i = atoi(retlvl);
}
break;
case RIG_LEVEL_IF:

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

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