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

Improve FTDX3000 antenna handling 

https://github.com/Hamlib/Hamlib/issues/510
pull/550/head
Michael Black W9MDB 2021-02-17 08:43:12 -06:00
rodzic 41f3fb5ce2
commit 5964e1de18
4 zmienionych plików z 15 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
doc/man1/rigctl.1
Wyświetl plik

@ -675,11 +675,11 @@ For the IC-7851, FTDX3000 (and perhaps others) it means this:
.IP .IP
.in +4n .in +4n
.EX .EX
1 = TX/RX = ANT1 1 = TX/RX = ANT1 FTDX3000=ANT1/ANT3
2 = TX/RX = ANT2 2 = TX/RX = ANT2 FTDX3000=ANT2/ANT3
3 = TX/RX = ANT3 3 = TX/RX = ANT3 FTDX3000=ANT3
4 = TX/RX = ANT1/ANT4 or ANT1/ANT3 4 = TX/RX = ANT1/ANT4
5 = TX/RX = ANT2/ANT4 or ANT2/ANT3 5 = TX/RX = ANT2/ANT4
6 = TX/RX = ANT3/ANT4 6 = TX/RX = ANT3/ANT4
.EE .EE
.in .in

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

@ -94,15 +94,15 @@ int ft3000_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option)
ENTERFUNC; ENTERFUNC;
switch (ant) switch (ant)
{ {
case 3: case 1:
cmd = "EX0320"; // TRX ANT3
break;
case 4:
cmd = "EX0321"; // R3/1 ANT1/ANT3 cmd = "EX0321"; // R3/1 ANT1/ANT3
break; break;
case 5: case 2:
cmd = "EX0322"; // RE/2 ANT2/ANT3 cmd = "EX0322"; // RE/2 ANT2/ANT3
break; break;
case 3:
cmd = "EX0320"; // TRX ANT3
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 3,4,5 got %d\n", __func__, ant);
RETURNFUNC(-RIG_EINVAL); RETURNFUNC(-RIG_EINVAL);

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

@ -3343,6 +3343,8 @@ int newcat_get_ant(RIG *rig, vfo_t vfo, ant_t dummy, value_t *option,
ENTERFUNC; ENTERFUNC;
option->i = 0; // default to no options
if (!newcat_valid_command(rig, command)) if (!newcat_valid_command(rig, command))
{ {
RETURNFUNC(-RIG_ENAVAIL); RETURNFUNC(-RIG_ENAVAIL);
@ -3399,6 +3401,8 @@ int newcat_get_ant(RIG *rig, vfo_t vfo, ant_t dummy, value_t *option,
RETURNFUNC(-RIG_EPROTO); RETURNFUNC(-RIG_EPROTO);
} }
*ant_tx = * ant_rx = *ant_curr;
RETURNFUNC(RIG_OK); RETURNFUNC(RIG_OK);
} }

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 "20210208" #define NEWCAT_VER "20210213"
/* 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