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

Change FTDX3000 antenna commands to use AN instead of menu commands that don't work 

https://github.com/Hamlib/Hamlib/issues/510
pull/552/head
Michael Black W9MDB 2021-02-18 14:20:21 -06:00
rodzic fb3e3d11aa
commit 8f5185bff8
1 zmienionych plików z 9 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
rigs/yaesu/ft3000.c
Wyświetl plik

@ -95,16 +95,16 @@ int ft3000_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option)
switch (ant) switch (ant)
{ {
case 1: case 1:
cmd = "EX0321;"; // R3/1 ANT1/ANT3 cmd = "AN01;"; // R3/1 ANT1/ANT3
break; break;
case 2: case 2:
cmd = "EX0322;"; // RE/2 ANT2/ANT3 cmd = "AN02;"; // RE/2 ANT2/ANT3
break; break;
case 3: case 3:
cmd = "EX0320;"; // TRX ANT3 cmd = "AN03;"; // TRX ANT3
break; break;
default: default:
rig_debug(RIG_DEBUG_ERR, "%s: expected 3,4,5 got %d\n", __func__, ant); rig_debug(RIG_DEBUG_ERR, "%s: expected 1,2,3 got %d\n", __func__, ant);
RETURNFUNC(-RIG_EINVAL); RETURNFUNC(-RIG_EINVAL);
} }
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s", cmd); snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s", cmd);
@ -126,7 +126,7 @@ int ft3000_get_ant(RIG *rig, vfo_t vfo, ant_t dummy, value_t *option,
option->i = 0; // default to no options option->i = 0; // default to no options
// find out what ANT3 setting // find out what ANT3 setting
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s", "EX032;"); snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s", "AN0;");
if (RIG_OK != (err = newcat_get_cmd(rig))) if (RIG_OK != (err = newcat_get_cmd(rig)))
{ {
RETURNFUNC(err); RETURNFUNC(err);
@ -134,12 +134,9 @@ int ft3000_get_ant(RIG *rig, vfo_t vfo, ant_t dummy, value_t *option,
if (strlen(priv->ret_data) >= 7) if (strlen(priv->ret_data) >= 7)
{ {
char c = priv->ret_data[5]; char c = priv->ret_data[3];
switch(c) switch(c)
{ {
case '0':
*ant_rx = *ant_tx = RIG_ANT_3;
break;
case '1': case '1':
*ant_rx = RIG_ANT_3; *ant_rx = RIG_ANT_3;
*ant_tx = RIG_ANT_1; *ant_tx = RIG_ANT_1;
@ -148,6 +145,9 @@ int ft3000_get_ant(RIG *rig, vfo_t vfo, ant_t dummy, value_t *option,
*ant_rx = RIG_ANT_3; *ant_rx = RIG_ANT_3;
*ant_tx = RIG_ANT_2; *ant_tx = RIG_ANT_2;
break; break;
case '3':
*ant_rx = *ant_tx = RIG_ANT_3;
break;
default: default:
rig_debug(RIG_DEBUG_ERR, "%s: unknown antenna=%c\n", __func__, c); rig_debug(RIG_DEBUG_ERR, "%s: unknown antenna=%c\n", __func__, c);
RETURNFUNC(-RIG_EPROTO); RETURNFUNC(-RIG_EPROTO);