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

Merge GitHub PR #1744

pull/1747/head
Nate Bargmann 2025-05-26 11:09:36 -05:00
rodzic 43017b38f0 b5df48d8d9
commit 717d720a36
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: FB2C5130D55A8819
1 zmienionych plików z 16 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

20
src/settings.c
Wyświetl plik

@ -90,6 +90,7 @@ int HAMLIB_API rig_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return -RIG_ENAVAIL; return -RIG_ENAVAIL;
} }
rig_lock(rig, 1);
if ((caps->targetable_vfo & RIG_TARGETABLE_LEVEL) if ((caps->targetable_vfo & RIG_TARGETABLE_LEVEL)
|| vfo == RIG_VFO_CURR || vfo == RIG_VFO_CURR
|| vfo == STATE(rig)->current_vfo) || vfo == STATE(rig)->current_vfo)
@ -103,12 +104,14 @@ int HAMLIB_API rig_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
} }
#endif #endif
retcode = caps->set_level(rig, vfo, level, val);
return caps->set_level(rig, vfo, level, val); rig_lock(rig, 0);
return retcode;
} }
if (!caps->set_vfo) if (!caps->set_vfo)
{ {
rig_lock(rig, 0);
return -RIG_ENTARGET; return -RIG_ENTARGET;
} }
@ -117,11 +120,13 @@ int HAMLIB_API rig_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
if (retcode != RIG_OK) if (retcode != RIG_OK)
{ {
rig_lock(rig, 0);
return retcode; return retcode;
} }
retcode = caps->set_level(rig, vfo, level, val); retcode = caps->set_level(rig, vfo, level, val);
caps->set_vfo(rig, curr_vfo); caps->set_vfo(rig, curr_vfo);
rig_lock(rig, 0);
return retcode; return retcode;
} }
@ -172,6 +177,7 @@ int HAMLIB_API rig_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
return -RIG_ENAVAIL; return -RIG_ENAVAIL;
} }
rig_lock(rig, 1); // Keep Out!
/* /*
* Special case(frontend emulation): calibrated S-meter reading * Special case(frontend emulation): calibrated S-meter reading
*/ */
@ -187,10 +193,12 @@ int HAMLIB_API rig_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
if (retcode != RIG_OK) if (retcode != RIG_OK)
{ {
rig_lock(rig, 0);
return retcode; return retcode;
} }
val->i = (int)rig_raw2val(rawstr.i, &rs->str_cal); val->i = (int)rig_raw2val(rawstr.i, &rs->str_cal);
rig_lock(rig, 0);
return RIG_OK; return RIG_OK;
} }
@ -199,12 +207,14 @@ int HAMLIB_API rig_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
|| vfo == RIG_VFO_CURR || vfo == RIG_VFO_CURR
|| vfo == rs->current_vfo) || vfo == rs->current_vfo)
{ {
retcode = caps->get_level(rig, vfo, level, val);
return caps->get_level(rig, vfo, level, val); rig_lock(rig, 0);
return retcode;
} }
if (!caps->set_vfo) if (!caps->set_vfo)
{ {
rig_lock(rig, 0);
return -RIG_ENTARGET; return -RIG_ENTARGET;
} }
@ -213,11 +223,13 @@ int HAMLIB_API rig_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
if (retcode != RIG_OK) if (retcode != RIG_OK)
{ {
rig_lock(rig, 0);
return retcode; return retcode;
} }
retcode = caps->get_level(rig, vfo, level, val); retcode = caps->get_level(rig, vfo, level, val);
caps->set_vfo(rig, curr_vfo); caps->set_vfo(rig, curr_vfo);
rig_lock(rig, 0);
return retcode; return retcode;
} }