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

Update multicast.c JSON 

https://github.com/Hamlib/Hamlib/issues/695
pull/1289/head
Mike Black W9MDB 2023-05-09 09:23:46 -05:00
rodzic 7985286208
commit b67803358c
1 zmienionych plików z 11 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

16
src/multicast.c
Wyświetl plik

@ -175,13 +175,14 @@ void json_add_vfoA(RIG *rig, char *msg)
if (rig->state.cache.widthMainA > 0)
{
json_add_int(msg, "Width", rig->state.cache.widthMainA, 1);
json_add_int(msg, "Width", rig->state.cache.widthMainA, 0);
}
// what about full duplex? rx_vfo would be in rx all the time?
rig_debug(RIG_DEBUG_ERR, "%s: rx_vfo=%s, tx_vfo=%s, split=%d\n", __func__, rig_strvfo(rig->state.rx_vfo), rig_strvfo(rig->state.tx_vfo), rig->state.cache.split);
#if 0 // not working quite yet
printf("%s: rx_vfo=%s, tx_vfo=%s, split=%d\n", __func__, rig_strvfo(rig->state.rx_vfo), rig_strvfo(rig->state.tx_vfo), rig->state.cache.split);
if (rig->state.rx_vfo != rig->state.tx_vfo && rig->state.cache.split)
if (rig->state.cache.split)
{
if (rig->state.tx_vfo && (RIG_VFO_B | RIG_VFO_MAIN_B))
{
@ -205,6 +206,7 @@ void json_add_vfoA(RIG *rig, char *msg)
json_add_boolean(msg, "TX", 0, 0);
}
#endif
strcat(msg, "\n}");
}
@ -212,8 +214,9 @@ void json_add_vfoB(RIG *rig, char *msg)
{
strcat(msg, ",\n{\n");
json_add_string(msg, "Name", "VFOB", 1);
json_add_int(msg, "Freq", rig->state.cache.freqMainB, 1);
json_add_int(msg, "Freq", rig->state.cache.freqMainB, 0);
#if 0
if (strlen(rig_strrmode(rig->state.cache.modeMainB)) > 0)
{
json_add_string(msg, "Mode", rig_strrmode(rig->state.cache.modeMainB), 1);
@ -221,9 +224,11 @@ void json_add_vfoB(RIG *rig, char *msg)
if (rig->state.cache.widthMainB > 0)
{
json_add_int(msg, "Width", rig->state.cache.widthMainB, 1);
}
json_add_int(msg, "Width", rig->state.cache.widthMainB, 0);
}
#endif
#if 0 // not working yet
if (rig->state.rx_vfo != rig->state.tx_vfo && rig->state.cache.split)
{
if (rig->state.tx_vfo && (RIG_VFO_B | RIG_VFO_MAIN_B))
@ -247,6 +252,7 @@ void json_add_vfoB(RIG *rig, char *msg)
json_add_boolean(msg, "RX", 1, 1);
json_add_boolean(msg, "TX", 1, 0);
}
#endif
strcat(msg, "\n}\n]\n");
}