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

Fix ptt for smartsdr slice so only the active slice gets positive ptt

pull/1568/head
Mike Black W9MDB 2024-06-09 23:40:52 -05:00
rodzic ff0ed58edf
commit 305e20948e
2 zmienionych plików z 24 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

29
rigs/flexradio/smartsdr.c
Wyświetl plik

@ -52,6 +52,7 @@ struct smartsdr_priv_data
int slicenum; // slice 0-7 maps to A-H int slicenum; // slice 0-7 maps to A-H
int seqnum; int seqnum;
int ptt; int ptt;
int tx; // when 1 this slice has PTT control
double freqA; double freqA;
double freqB; double freqB;
rmode_t modeA; rmode_t modeA;
@ -178,6 +179,7 @@ int smartsdr_init(RIG *rig)
rs->model_name); rs->model_name);
RETURNFUNC(-RIG_ENIMPL); RETURNFUNC(-RIG_ENIMPL);
} }
priv->ptt = 0; priv->ptt = 0;
RETURNFUNC(RIG_OK); RETURNFUNC(RIG_OK);
@ -261,11 +263,14 @@ int smartsdr_open(RIG *rig)
sprintf(cmd, "sub slice %d", priv->slicenum); sprintf(cmd, "sub slice %d", priv->slicenum);
//sprintf(cmd, "sub slice all"); //sprintf(cmd, "sub slice all");
smartsdr_transaction(rig, cmd); smartsdr_transaction(rig, cmd);
do
do
{ {
hl_usleep(100*1000); hl_usleep(100 * 1000);
smartsdr_transaction(rig, NULL); smartsdr_transaction(rig, NULL);
} while (priv->freqA == 0 && --loops > 0); }
while (priv->freqA == 0 && --loops > 0);
//smartsdr_transaction(rig, "info", buf, sizeof(buf)); //smartsdr_transaction(rig, "info", buf, sizeof(buf));
//rig_debug(RIG_DEBUG_VERBOSE, "%s: info=%s", __func__, buf); //rig_debug(RIG_DEBUG_VERBOSE, "%s: info=%s", __func__, buf);
@ -453,7 +458,13 @@ static int smartsdr_parse_S(RIG *rig, char *s)
{ {
if (strcmp(state, "TRANSMITTING") == 0) { priv->ptt = 1; } if (strcmp(state, "TRANSMITTING") == 0) { priv->ptt = 1; }
else { priv->ptt = 0; } else { priv->ptt = 0; }
rig_debug(RIG_DEBUG_VERBOSE, "%s: PTT state=%s, ptt=%d\n", __func__, state, priv->ptt);
rig_debug(RIG_DEBUG_VERBOSE, "%s: PTT state=%s, ptt=%d\n", __func__, state,
priv->ptt);
}
else if (sscanf(p, "tx=%d\n", &priv->tx))
{
rig_debug(RIG_DEBUG_VERBOSE, "%s: tx=%d\n", __func__, priv->tx);
} }
} }
while ((p = strtok(NULL, sep))); while ((p = strtok(NULL, sep)));
@ -519,7 +530,13 @@ int smartsdr_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
struct smartsdr_priv_data *priv = (struct smartsdr_priv_data *)STATE(rig)->priv; struct smartsdr_priv_data *priv = (struct smartsdr_priv_data *)STATE(rig)->priv;
ENTERFUNC; ENTERFUNC;
smartsdr_transaction(rig, NULL); smartsdr_transaction(rig, NULL);
*ptt = priv->ptt; *ptt = 0;
if (priv->tx)
{
*ptt = priv->ptt;
}
rig_debug(RIG_DEBUG_VERBOSE, "%s: ptt=%d\n", __func__, *ptt); rig_debug(RIG_DEBUG_VERBOSE, "%s: ptt=%d\n", __func__, *ptt);
RETURNFUNC(RIG_OK); RETURNFUNC(RIG_OK);
} }

2
rigs/flexradio/smartsdr_caps.h
Wyświetl plik

@ -1,5 +1,5 @@
.mfg_name = "Flex-radio", .mfg_name = "Flex-radio",
.version = "20240606.0", .version = "20240609.0",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_STABLE, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,