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

Change Icom frame.c to only look for 0xfd for end of frame. Was not seeing error frames] 

https://github.com/Hamlib/Hamlib/issues/818
pull/822/head
Mike Black W9MDB 2021-10-10 16:27:58 -05:00
rodzic 2ff6b5ebeb
commit 75408098a4
2 zmienionych plików z 9 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
rigs/icom/frame.c
Wyświetl plik

@ -439,8 +439,8 @@ int icom_transaction(RIG *rig, int cmd, int subcmd,
} }
/* used in read_icom_frame as end of block */ /* used in read_icom_frame as end of block */
static const char icom_block_end[2] = {FI, COL}; static const char icom_block_end[1] = {COL};
#define icom_block_end_length 2 #define icom_block_end_length 1
/* /*
* read_icom_frame * read_icom_frame
@ -469,7 +469,7 @@ int read_icom_frame(hamlib_port_t *p, unsigned char rxbuffer[],
int i = read_string(p, rx_ptr, MAXFRAMELEN - read, int i = read_string(p, rx_ptr, MAXFRAMELEN - read,
icom_block_end, icom_block_end_length); icom_block_end, icom_block_end_length);
if (i < 0) /* die on errors */ if (i < 0 && i != RIG_BUSBUSY) /* die on errors */
{ {
RETURNFUNC(i); RETURNFUNC(i);
} }
@ -483,9 +483,12 @@ int read_icom_frame(hamlib_port_t *p, unsigned char rxbuffer[],
} }
/* OK, we got something. add it in and continue */ /* OK, we got something. add it in and continue */
if (i > 0)
{
read += i; read += i;
rx_ptr += i; rx_ptr += i;
} }
}
while ((read < rxbuffer_len) && (rxbuffer[read - 1] != FI) while ((read < rxbuffer_len) && (rxbuffer[read - 1] != FI)
&& (rxbuffer[read - 1] != COL)); && (rxbuffer[read - 1] != COL));

2
rigs/icom/icom.h
Wyświetl plik

@ -30,7 +30,7 @@
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#define BACKEND_VER "20211005" #define BACKEND_VER "20211010"
#define ICOM_IS_SECONDARY_VFO(vfo) ((vfo) & (RIG_VFO_B | RIG_VFO_SUB | RIG_VFO_SUB_B | RIG_VFO_MAIN_B)) #define ICOM_IS_SECONDARY_VFO(vfo) ((vfo) & (RIG_VFO_B | RIG_VFO_SUB | RIG_VFO_SUB_B | RIG_VFO_MAIN_B))
#define ICOM_GET_VFO_NUMBER(vfo) (ICOM_IS_SECONDARY_VFO(vfo) ? 0x01 : 0x00) #define ICOM_GET_VFO_NUMBER(vfo) (ICOM_IS_SECONDARY_VFO(vfo) ? 0x01 : 0x00)