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

Update simic7300 and simic7000

pull/1662/head
Michael Black W9MDB 2024-12-26 15:33:20 -06:00
rodzic eb7a828f5e
commit 5d8593dd73
2 zmienionych plików z 61 dodań i 34 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

38
simulators/simic7000.c
Wyświetl plik

@ -72,18 +72,17 @@ again:
while (read(fd, &c, 1) > 0)
{
buf[i++] = c;
//printf("i=%d, c=0x%02x\n",i,c);
printf("i=%d, c=0x%02x\n", i, c);
if (c == 0xfd)
{
char mytime[256];
date_strget(mytime, sizeof(mytime), 1);
printf("%s:", mytime); dumphex(buf, i);
printf("\n");
// echo
n = write(fd, buf, i);
if (n != i) { printf("%s: error on write: %s\n", __func__, strerror(errno)); }
//n = write(fd, buf, i);
//if (n != i) { printf("%s: error on write: %s\n", __func__, strerror(errno)); }
return i;
}
@ -132,7 +131,7 @@ void frameParse(int fd, unsigned char *frame, int len)
{
case 0x03:
if (frame[5] != 0xfd)
if (frame[5] == 0xfd)
{
//from_bcd(frameackbuf[2], (civ_731_mode ? 4 : 5) * 2);
if (current_vfo == RIG_VFO_A || current_vfo == RIG_VFO_MAIN)
@ -153,21 +152,21 @@ void frameParse(int fd, unsigned char *frame, int len)
n = write(fd, frame, 11);
dump_hex(frame, 11);
}
}
else
{
if (current_vfo == RIG_VFO_A)
{
freqA = from_bcd(&frame[5], (civ_731_mode ? 4 : 5) * 2);
}
else
{
if (current_vfo == RIG_VFO_A)
{
freqA = from_bcd(&frame[5], (civ_731_mode ? 4 : 5) * 2);
}
else
{
freqB = from_bcd(&frame[5], (civ_731_mode ? 4 : 5) * 2);
}
frame[4] = 0xfb;
frame[5] = 0xfd;
n = write(fd, frame, 6);
freqB = from_bcd(&frame[5], (civ_731_mode ? 4 : 5) * 2);
}
frame[4] = 0xfb;
frame[5] = 0xfd;
n = write(fd, frame, 6);
}
break;
@ -614,6 +613,9 @@ int main(int argc, char **argv)
if (powerstat)
{
unsigned char tmp = buf[2];
buf[2] = buf[3];
buf[3] = tmp;
frameParse(fd, buf, len);
}
else

57
simulators/simic7300.c
Wyświetl plik

@ -76,7 +76,13 @@ again:
if (c == 0xfd)
{
dumphex(buf, i);
char mytime[256];
date_strget(mytime, sizeof(mytime), 1);
printf("%s:", mytime); dumphex(buf, i);
printf("\n");
// echo
//n = write(fd, buf, i);
//if (n != i) { printf("%s: error on write: %s\n", __func__, strerror(errno)); }
return i;
}
@ -125,27 +131,46 @@ void frameParse(int fd, unsigned char *frame, int len)
{
case 0x03:
//from_bcd(frameackbuf[2], (civ_731_mode ? 4 : 5) * 2);
if (current_vfo == RIG_VFO_A || current_vfo == RIG_VFO_MAIN)
if (frame[5] == 0xfd)
{
printf("get_freqA\n");
to_bcd(&frame[5], (long long)freqA, (civ_731_mode ? 4 : 5) * 2);
//from_bcd(frameackbuf[2], (civ_731_mode ? 4 : 5) * 2);
if (current_vfo == RIG_VFO_A || current_vfo == RIG_VFO_MAIN)
{
printf("get_freqA\n");
to_bcd(&frame[5], (long long)freqA, (civ_731_mode ? 4 : 5) * 2);
}
else
{
printf("get_freqB\n");
to_bcd(&frame[5], (long long)freqB, (civ_731_mode ? 4 : 5) * 2);
}
frame[10] = 0xfd;
if (powerstat)
{
dump_hex(frame, 11);
n = write(fd, frame, 11);
if (n <= 0) { fprintf(stderr, "%s(%d) write error %s\n", __func__, __LINE__, strerror(errno)); }
}
}
else
{
printf("get_freqB\n");
to_bcd(&frame[5], (long long)freqB, (civ_731_mode ? 4 : 5) * 2);
if (current_vfo == RIG_VFO_A)
{
freqA = from_bcd(&frame[5], (civ_731_mode ? 4 : 5) * 2);
}
else
{
freqB = from_bcd(&frame[5], (civ_731_mode ? 4 : 5) * 2);
}
frame[4] = 0xfb;
frame[5] = 0xfd;
n = write(fd, frame, 6);
}
frame[10] = 0xfd;
if (powerstat)
{
dump_hex(frame, 11);
n = write(fd, frame, 11);
if (n <= 0) { fprintf(stderr, "%s(%d) write error %s\n", __func__, __LINE__, strerror(errno)); }
}
break;