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

fix to make get_freq work for the ft920 (different than ft847) 

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1224 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.1.4
Stéphane Fillod, F8CFE 2002-10-29 23:47:37 +00:00
rodzic 6f937fd137
commit 4fb92f36e7
1 zmienionych plików z 12 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
yaesu/ft920.c
Wyświetl plik

@ -11,7 +11,7 @@
* pages 86 to 90 * pages 86 to 90
* *
* *
* $Id: ft920.c,v 1.1 2002-10-28 04:53:05 n0nb Exp $ * $Id: ft920.c,v 1.2 2002-10-29 23:47:37 fillods Exp $
* *
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -432,7 +432,8 @@ int ft920_set_freq(RIG *rig, vfo_t vfo, freq_t freq) {
*/ */
int ft920_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) { int ft920_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) {
struct ft920_priv_data *p; struct ft920_priv_data *priv;
unsigned char *p;
freq_t f; freq_t f;
rig_debug(RIG_DEBUG_VERBOSE,"ft920:ft920_get_freq called \n"); rig_debug(RIG_DEBUG_VERBOSE,"ft920:ft920_get_freq called \n");
@ -440,27 +441,30 @@ int ft920_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) {
if (!rig) if (!rig)
return -RIG_EINVAL; return -RIG_EINVAL;
p = (struct ft920_priv_data*)rig->state.priv; priv = (struct ft920_priv_data*)rig->state.priv;
ft920_get_update_data(rig); /* get whole shebang from rig */ ft920_get_update_data(rig); /* get whole shebang from rig */
if (vfo == RIG_VFO_CURR ) if (vfo == RIG_VFO_CURR )
vfo = p->current_vfo; /* from previous vfo cmd */ vfo = priv->current_vfo; /* from previous vfo cmd */
switch(vfo) { switch(vfo) {
case RIG_VFO_A: case RIG_VFO_A:
f = from_bcd_be(&(p->update_data[FT920_SUMO_VFO_A_FREQ]),8); /* grab freq and convert */ p = &priv->update_data[FT920_SUMO_VFO_A_FREQ];
break; break;
case RIG_VFO_B: case RIG_VFO_B:
f = from_bcd_be(&(p->update_data[FT920_SUMO_VFO_B_FREQ]),8); /* grab freq and convert */ p = &priv->update_data[FT920_SUMO_VFO_B_FREQ];
break; break;
default: default:
return -RIG_EINVAL; /* sorry, wrong VFO */ return -RIG_EINVAL; /* sorry, wrong VFO */
} }
/* big endian integer */
f = (((((p[0]<<8) + p[1])<<8) + p[2])<<8) + p[3];
rig_debug(RIG_DEBUG_VERBOSE,"ft920: freq = %lli Hz for VFO = %u \n", f, vfo); rig_debug(RIG_DEBUG_VERBOSE,"ft920: freq = %lli Hz for VFO = %u \n", f, vfo);
(*freq) = f; /* return diplayed frequency */ *freq = f; /* return diplayed frequency */
return RIG_OK; return RIG_OK;
} }