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

Revert "Fix CRC calculation in pmr171.c" 

Pull request being done instead
This reverts commit 194e18f4e4.
pull/1667/head
Michael Black W9MDB 2025-01-25 11:59:25 -06:00
rodzic 194e18f4e4
commit e44da73e9a
1 zmienionych plików z 4 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
rigs/yaesu/pmr171.c
Wyświetl plik

@ -177,9 +177,9 @@ struct rig_caps pmr171_caps =
RIG_MODEL(RIG_MODEL_PMR171), RIG_MODEL(RIG_MODEL_PMR171),
.model_name = "PMR-171", .model_name = "PMR-171",
.mfg_name = "Guohe", .mfg_name = "Guohe",
.version = "20250125.0", .version = "20240704.0",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_STABLE, .status = RIG_STATUS_ALPHA,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
.ptt_type = RIG_PTT_RIG, .ptt_type = RIG_PTT_RIG,
.dcd_type = RIG_DCD_RIG, .dcd_type = RIG_DCD_RIG,
@ -456,7 +456,7 @@ static int pmr171_send_cmd1(RIG *rig, unsigned char cmd, unsigned char *reply)
unsigned char buf[64] = { 0xa5, 0xa5, 0xa5, 0xa5, 0x03, 0x00, 0x00, 0x00 }; unsigned char buf[64] = { 0xa5, 0xa5, 0xa5, 0xa5, 0x03, 0x00, 0x00, 0x00 };
buf[5] = cmd; buf[5] = cmd;
unsigned int crc = CRC16Check(&buf[4], 2); unsigned int crc = CRC16Check(&buf[4], 3);
buf[6] = crc >> 8; buf[6] = crc >> 8;
buf[7] = crc & 0xff; buf[7] = crc & 0xff;
rig_flush(rp); rig_flush(rp);
@ -809,7 +809,7 @@ static int pmr171_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
to_bcd_be(&cmd[10], CACHE(rig)->freqMainB, 8); to_bcd_be(&cmd[10], CACHE(rig)->freqMainB, 8);
} }
unsigned int crc = CRC16Check(&cmd[4], 2); unsigned int crc = CRC16Check(&cmd[4], 12);
cmd[14] = crc >> 8; cmd[14] = crc >> 8;
cmd[15] = crc & 0xff; cmd[15] = crc & 0xff;
rig_flush(rp); rig_flush(rp);