[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 9c187349117592a5a3fe2
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 9c187349117592a5a3fe21375c0508c11a262c09
|
From: n0nb <n0...@us...> - 2025-06-27 12:27:16
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Hamlib -- Ham radio control libraries".
The branch, master has been updated
via 9c187349117592a5a3fe21375c0508c11a262c09 (commit)
via cb308819e7c1f65e6b0045fe154446f06376ad7c (commit)
via 7fe7602a8289fd9bc74a350ea084c72640c319ad (commit)
from 36f582222f6a460735cf0538990cfc20fd46888e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9c187349117592a5a3fe21375c0508c11a262c09
Author: Nate Bargmann <n0...@n0...>
Date: Fri Jun 27 07:22:21 2025 -0500
Update NEWS for recent merges
diff --git a/NEWS b/NEWS
index 31627e686..8e7e076a8 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,11 @@ Version 4.7.0
* Remove dead getopt code. GitHub PR #1709. (TNX Daniele Forsi)
* Move rig_cache to separate(calloc) storage. Prepare for other moves.
Issue #1420
+ * Many fixes for SWIG binding generation and improved Python support
+ and testing. (TNX Daniele Forsi).
+ * Fix AGC for IC-R75, fix AGC for all Icom rigs. (TNX Mark Fine).
+ * Separate PMR-171 and Q900 into new the GUOHETEC backend, add
+ additional support add clean up code. (TNX FVsonar).
Version 4.6.3
* 2025-06-10
commit cb308819e7c1f65e6b0045fe154446f06376ad7c
Merge: 36f582222 7fe7602a8
Author: Nate Bargmann <n0...@n0...>
Date: Fri Jun 27 06:53:07 2025 -0500
Merge GitHub PR #1785
commit 7fe7602a8289fd9bc74a350ea084c72640c319ad
Author: 声纳 <159...@qq...>
Date: Fri Jun 27 11:12:46 2025 +0800
Delete redundant functions and structures in guohetec. c, pmr171. c, and q900. c, optimize code structure, fix data length verification logic, and ensure the security and stability of data processing. All cppcheck style warnings have been fixed
diff --git a/rigs/guohetec/guohetec.c b/rigs/guohetec/guohetec.c
index 8f074f23b..49b1a1a30 100644
--- a/rigs/guohetec/guohetec.c
+++ b/rigs/guohetec/guohetec.c
@@ -97,23 +97,6 @@ uint16_t CRC16Check(const unsigned char *buf, int len)
}
- unsigned long long from_be(const unsigned char data[],
- unsigned int byte_len)
- {
- int i;
- unsigned long long f = 0;
-
- rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
-
- for (i = 0; i < byte_len; i++)
- {
- f = (f << 8) + data[i];
- }
-
- return f;
- }
-
-
// Initialization function
DECLARE_INITRIG_BACKEND(guohetec) {
rig_debug(RIG_DEBUG_VERBOSE, "%s: Initializing guohetec \n", __func__);
@@ -136,7 +119,6 @@ DECLARE_PROBERIG_BACKEND(guohetec) {
};
uint8_t reply[PMR171_REPLY_LENGTH];
- int retval;
int orig_rate = port->parm.serial.rate;
int orig_timeout = port->timeout;
@@ -153,7 +135,7 @@ DECLARE_PROBERIG_BACKEND(guohetec) {
rig_flush(port);
- retval = write_block(port, cmd, PMR171_CMD_LENGTH);
+ int retval = write_block(port, cmd, PMR171_CMD_LENGTH);
if (retval != RIG_OK) {
continue;
}
diff --git a/rigs/guohetec/pmr171.c b/rigs/guohetec/pmr171.c
index b876ed989..c89fa6744 100644
--- a/rigs/guohetec/pmr171.c
+++ b/rigs/guohetec/pmr171.c
@@ -18,31 +18,6 @@
#include <unistd.h>
-struct pmr171_priv_data
-{
- /* rx status */
- struct timeval rx_status_tv;
- unsigned char rx_status;
-
- /* tx status */
- struct timeval tx_status_tv;
- unsigned char tx_status; /* Raw data from rig. Highest bit 0 = PTT */
-
- /* tx levels */
- struct timeval tx_level_tv;
- unsigned char swr_level;
- unsigned char alc_level;
- unsigned char mod_level;
- unsigned char pwr_level; /* TX power level */
-
- /* freq & mode status */
- struct timeval fm_status_tv;
- unsigned char fm_status[5]; /* 5 bytes, NOT related to YAESU_CMD_LENGTH */
- /* Digi mode is not part of regular fm_status response.
- * So keep track of it in a separate variable. */
- unsigned char dig_mode;
-};
-
typedef struct pmr171_data_s
{
char ptt;
@@ -345,7 +320,7 @@ static int pmr171_open(RIG *rig)
/* ---------------------------------------------------------------------- */
- static int pmr171_send(RIG *rig, unsigned char* buff, int len, unsigned char *reply, int rlen)
+ static int pmr171_send(RIG *rig, const unsigned char* buff, int len, unsigned char *reply, int rlen)
{
hamlib_port_t *rp = RIGPORT(rig);
int retry = 5;
@@ -401,10 +376,7 @@ static int pmr171_open(RIG *rig)
// Receive buffer (complete response packet should be 33 bytes)
unsigned char reply[40];
- int ret = pmr171_send(rig, cmd, sizeof(cmd), reply, sizeof(reply));
- if (ret != RIG_OK) {
- rig_debug(RIG_DEBUG_ERR, "%s: Communication failure, error code=%d\n", __func__, ret);
- }
+ pmr171_send(rig, cmd, sizeof(cmd), reply, sizeof(reply));
/* ----------- Protocol validation ----------- */
// 1. Check packet header
@@ -472,7 +444,7 @@ static int pmr171_open(RIG *rig)
{
struct rig_cache *cachep = CACHE(rig);
hamlib_port_t *rp = RIGPORT(rig);
- pmr171_data_t *p = (pmr171_data_t *) STATE(rig)->priv;
+ const pmr171_data_t *p = (pmr171_data_t *) STATE(rig)->priv;
unsigned char reply[40];
// Get latest status from hardware
@@ -482,22 +454,26 @@ static int pmr171_open(RIG *rig)
int ret = read_block(rp, reply, 5);
if (ret < 0) {
rig_debug(RIG_DEBUG_ERR, "%s: Failed to read header\n", __func__);
+ return -RIG_ETIMEOUT;
}
// Validate data length
- if (reply[4] <= 0 || reply[4] > sizeof(reply) - 5) {
+ if (reply[4] == 0 || reply[4] > sizeof(reply) - 5) {
rig_debug(RIG_DEBUG_ERR, "%s: Invalid data length %d\n", __func__, reply[4]);
+ return -RIG_EPROTO;
}
// Read data section
ret = read_block(rp, &reply[5], reply[4]);
if (ret < 0) {
rig_debug(RIG_DEBUG_ERR, "%s: Failed to read data\n", __func__);
+ return -RIG_ETIMEOUT;
}
// Validate mode field index won't overflow
if (reply[4] < 5) { // Need at least 5 bytes to access reply[7] and reply[8]
rig_debug(RIG_DEBUG_ERR, "%s: Response too short for mode data\n", __func__);
+ return -RIG_EPROTO;
}
// Update cache
@@ -533,22 +509,26 @@ static int pmr171_open(RIG *rig)
int ret = read_block(rp, reply, 5);
if (ret < 0) {
rig_debug(RIG_DEBUG_ERR, "%s: Failed to read header\n", __func__);
+ return -RIG_ETIMEOUT;
}
// Validate data length
- if (reply[4] <= 0 || reply[4] > sizeof(reply) - 5) {
+ if (reply[4] == 0 || reply[4] > sizeof(reply) - 5) {
rig_debug(RIG_DEBUG_ERR, "%s: Invalid data length %d\n", __func__, reply[4]);
+ return -RIG_EPROTO;
}
// Read data section
ret = read_block(rp, &reply[5], reply[4]);
if (ret < 0) {
rig_debug(RIG_DEBUG_ERR, "%s: Failed to read data\n", __func__);
+ return -RIG_ETIMEOUT;
}
// Validate VFO status field index won't overflow
if (reply[4] < 13) { // Need at least 13 bytes to access reply[17]
rig_debug(RIG_DEBUG_ERR, "%s: Response too short for VFO data\n", __func__);
+ return -RIG_EPROTO;
}
// According to protocol doc, reply[17] is A/B frequency status
@@ -570,22 +550,26 @@ static int pmr171_open(RIG *rig)
int ret = read_block(rp, reply, 5);
if (ret < 0) {
rig_debug(RIG_DEBUG_ERR, "%s: Failed to read header\n", __func__);
+ return -RIG_ETIMEOUT;
}
// Validate data length
- if (reply[4] <= 0 || reply[4] > sizeof(reply) - 5) {
+ if (reply[4] == 0 || reply[4] > sizeof(reply) - 5) {
rig_debug(RIG_DEBUG_ERR, "%s: Invalid data length %d\n", __func__, reply[4]);
+ return -RIG_EPROTO;
}
// Read data section
ret = read_block(rp, &reply[5], reply[4]);
if (ret < 0) {
rig_debug(RIG_DEBUG_ERR, "%s: Failed to read data\n", __func__);
+ return -RIG_ETIMEOUT;
}
// Validate PTT status field index won't overflow
if (reply[4] < 2) { // Need at least 2 bytes to access reply[6]
rig_debug(RIG_DEBUG_ERR, "%s: Response too short for PTT data\n", __func__);
+ return -RIG_EPROTO;
}
// Get PTT status
@@ -650,7 +634,7 @@ static int pmr171_open(RIG *rig)
}
// Validate data length
- if (reply[4] <= 0 || reply[4] > sizeof(reply) - 5) {
+ if (reply[4] == 0 || reply[4] > sizeof(reply) - 5) {
rig_debug(RIG_DEBUG_ERR, "%s: Invalid data length %d\n", __func__, reply[4]);
}
@@ -735,60 +719,53 @@ static int pmr171_open(RIG *rig)
hamlib_port_t *rp = RIGPORT(rig);
unsigned char cmd[10] = { 0xa5, 0xa5, 0xa5, 0xa5, 5, 0x0a, 0x00, 0x00, 0x00, 0x00 };
unsigned char reply[10];
- int crc;
unsigned char i = rmode2guohe(mode, pmr171_modes);
- if (i != (-1))
+ if (vfo == RIG_VFO_B)
{
- if (vfo == RIG_VFO_B)
- {
- cmd[6] = rmode2guohe(CACHE(rig)->modeMainA, pmr171_modes);
- cmd[7] = i;
- }
- else
- {
- cmd[6] = i;
- cmd[7] = rmode2guohe(CACHE(rig)->modeMainB, pmr171_modes);
- }
-
- crc = CRC16Check(&cmd[4], 4);
- cmd[8] = crc >> 8;
- cmd[9] = crc & 0xff;
- rig_flush(rp);
- write_block(rp, cmd, 10);
-
- // Read header
- int ret = read_block(rp, reply, 5);
- if (ret < 0) {
- rig_debug(RIG_DEBUG_ERR, "%s: read_block failed for header\n", __func__);
- }
-
- // Validate data length
- if (reply[4] <= 0 || reply[4] > sizeof(reply) - 5) {
- rig_debug(RIG_DEBUG_ERR, "%s: invalid reply length %d\n", __func__, reply[4]);
- }
-
- // Read data section
- ret = read_block(rp, &reply[5], reply[4]);
- if (ret < 0) {
- rig_debug(RIG_DEBUG_ERR, "%s: read_block failed for data\n", __func__);
- }
-
- // Validate mode field index won't overflow
- if (reply[4] < 3) { // Need at least 3 bytes to access reply[6] and reply[7]
- rig_debug(RIG_DEBUG_ERR, "%s: Response too short for mode data\n", __func__);
- }
-
- dump_hex(reply, reply[4] + 5);
-
- // Update cache
- CACHE(rig)->modeMainA = guohe2rmode(reply[6], pmr171_modes);
- CACHE(rig)->modeMainB = guohe2rmode(reply[7], pmr171_modes);
+ cmd[6] = rmode2guohe(CACHE(rig)->modeMainA, pmr171_modes);
+ cmd[7] = i;
+ }
+ else
+ {
+ cmd[6] = i;
+ cmd[7] = rmode2guohe(CACHE(rig)->modeMainB, pmr171_modes);
+ }
- return RIG_OK;
+ int crc = CRC16Check(&cmd[4], 4);
+ cmd[8] = crc >> 8;
+ cmd[9] = crc & 0xff;
+ rig_flush(rp);
+ write_block(rp, cmd, 10);
+
+ // Read header
+ int ret = read_block(rp, reply, 5);
+ if (ret < 0) {
+ rig_debug(RIG_DEBUG_ERR, "%s: read_block failed for header\n", __func__);
}
+
+ // Validate data length
+ if (reply[4] == 0 || reply[4] > sizeof(reply) - 5) {
+ rig_debug(RIG_DEBUG_ERR, "%s: invalid reply length %d\n", __func__, reply[4]);
+ }
+
+ // Read data section
+ ret = read_block(rp, &reply[5], reply[4]);
+ if (ret < 0) {
+ rig_debug(RIG_DEBUG_ERR, "%s: read_block failed for data\n", __func__);
+ }
+
+ // Validate mode field index won't overflow
+ if (reply[4] < 3) { // Need at least 3 bytes to access reply[6] and reply[7]
+ rig_debug(RIG_DEBUG_ERR, "%s: Response too short for mode data\n", __func__);
+ }
+
+ dump_hex(reply, reply[4] + 5);
+
+ // Update cache
+ CACHE(rig)->modeMainA = guohe2rmode(reply[6], pmr171_modes);
+ CACHE(rig)->modeMainB = guohe2rmode(reply[7], pmr171_modes);
- rig_debug(RIG_DEBUG_ERR, "%s: invalid mode=%s\n", __func__, rig_strrmode(mode));
return RIG_OK;
}
@@ -807,10 +784,7 @@ static int pmr171_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
cmd[8] = crc & 0xff;
unsigned char reply[9];
- int ret = pmr171_send(rig, cmd, sizeof(cmd), reply, sizeof(reply));
- if (ret != RIG_OK) {
- rig_debug(RIG_DEBUG_ERR, "%s: PTT command failed\n", __func__);
- }
+ pmr171_send(rig, cmd, sizeof(cmd), reply, sizeof(reply));
CACHE(rig)->ptt = ptt;
diff --git a/rigs/guohetec/q900.c b/rigs/guohetec/q900.c
index 29017b1a6..92973740a 100644
--- a/rigs/guohetec/q900.c
+++ b/rigs/guohetec/q900.c
@@ -17,31 +17,6 @@
#include <stdint.h>
#include <unistd.h>
-struct q900_priv_data
-{
- /* rx status */
- struct timeval rx_status_tv;
- unsigned char rx_status;
-
- /* tx status */
- struct timeval tx_status_tv;
- unsigned char tx_status; /* Raw data from rig. Highest bit 0 = PTT */
-
- /* tx levels */
- struct timeval tx_level_tv;
- unsigned char swr_level;
- unsigned char alc_level;
- unsigned char mod_level;
- unsigned char pwr_level; /* TX power level */
-
- /* freq & mode status */
- struct timeval fm_status_tv;
- unsigned char fm_status[5]; /* 5 bytes, NOT related to YAESU_CMD_LENGTH */
- /* Digi mode is not part of regular fm_status response.
- * So keep track of it in a separate variable. */
- unsigned char dig_mode;
-};
-
typedef struct q900_data_s
{
char ptt;
@@ -344,7 +319,7 @@ static int q900_open(RIG *rig)
/* ---------------------------------------------------------------------- */
- static int q900_send(RIG *rig, unsigned char* buff, int len, unsigned char *reply, int rlen)
+ static int q900_send(RIG *rig, const unsigned char* buff, int len, unsigned char *reply, int rlen)
{
hamlib_port_t *rp = RIGPORT(rig);
int retry = 5;
@@ -397,18 +372,16 @@ static int q900_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
cmd[7] = crc & 0xFF;
unsigned char reply[40];
- int ret = q900_send(rig, cmd, sizeof(cmd), reply, sizeof(reply));
- if (ret != RIG_OK) {
- rig_debug(RIG_DEBUG_ERR, "%s: Communication failure, error code=%d\n", __func__, ret);
- }
+ q900_send(rig, cmd, sizeof(cmd), reply, sizeof(reply));
if (reply[0] != 0xA5 || reply[1] != 0xA5 ||
reply[2] != 0xA5 || reply[3] != 0xA5) {
rig_debug(RIG_DEBUG_ERR, "%s: Invalid packet header\n", __func__);
}
- if (reply[4] != 0x1B) {
- rig_debug(RIG_DEBUG_ERR, "%s: Invalid packet length %d\n", __func__, reply[4]);
+ if (reply[4] == 0 || reply[4] > sizeof(reply) - 5) {
+ rig_debug(RIG_DEBUG_ERR, "%s: Invalid data length %d\n", __func__, reply[4]);
+ return -RIG_EPROTO;
}
// Validate buffer boundaries - ensure enough space for CRC
@@ -459,7 +432,7 @@ static int q900_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
{
struct rig_cache *cachep = CACHE(rig);
hamlib_port_t *rp = RIGPORT(rig);
- q900_data_t *p = (q900_data_t *) STATE(rig)->priv;
+ const q900_data_t *p = (q900_data_t *) STATE(rig)->priv;
unsigned char reply[255];
q900_send_cmd1(rig, 0x0b, 0);
@@ -468,37 +441,44 @@ static int q900_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
int ret = read_block(rp, reply, 5);
if (ret < 0) {
rig_debug(RIG_DEBUG_ERR, "%s: Failed to read header\n", __func__);
+ return -RIG_ETIMEOUT;
}
// Validate data length
- if (reply[4] <= 0 || reply[4] > sizeof(reply) - 5) {
+ if (reply[4] == 0 || reply[4] > sizeof(reply) - 5) {
rig_debug(RIG_DEBUG_ERR, "%s: Invalid data length %d\n", __func__, reply[4]);
+ return -RIG_EPROTO;
}
// Read data section
ret = read_block(rp, &reply[5], reply[4]);
if (ret < 0) {
rig_debug(RIG_DEBUG_ERR, "%s: Failed to read data\n", __func__);
+ return -RIG_ETIMEOUT;
}
// Validate response length matches expected
if (ret != reply[4]) {
rig_debug(RIG_DEBUG_ERR, "%s: Data read mismatch: expected %d, got %d\n",
__func__, reply[4], ret);
+ return -RIG_EPROTO;
}
// Validate mode field index won't overflow
if (reply[4] < 5) { // Need at least 5 bytes to access reply[7] and reply[8]
rig_debug(RIG_DEBUG_ERR, "%s: Response too short for mode data\n", __func__);
+ return -RIG_EPROTO;
}
// Validate mode field indices are within bounds
if (reply[7] >= GUOHE_MODE_TABLE_MAX) {
rig_debug(RIG_DEBUG_ERR, "%s: Invalid mode A index %d\n", __func__, reply[7]);
+ return -RIG_EPROTO;
}
if (reply[8] >= GUOHE_MODE_TABLE_MAX) {
rig_debug(RIG_DEBUG_ERR, "%s: Invalid mode B index %d\n", __func__, reply[8]);
+ return -RIG_EPROTO;
}
cachep->modeMainA = guohe2rmode(reply[7], q900_modes);
@@ -531,33 +511,39 @@ static int q900_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
int ret = read_block(rp, reply, 5);
if (ret < 0) {
rig_debug(RIG_DEBUG_ERR, "%s: Failed to read header\n", __func__);
+ return -RIG_ETIMEOUT;
}
// Validate data length
- if (reply[4] <= 0 || reply[4] > sizeof(reply) - 5) {
+ if (reply[4] == 0 || reply[4] > sizeof(reply) - 5) {
rig_debug(RIG_DEBUG_ERR, "%s: Invalid data length %d\n", __func__, reply[4]);
+ return -RIG_EPROTO;
}
// Read data section
ret = read_block(rp, &reply[5], reply[4]);
if (ret < 0) {
rig_debug(RIG_DEBUG_ERR, "%s: Failed to read data\n", __func__);
+ return -RIG_ETIMEOUT;
}
// Validate response length matches expected
if (ret != reply[4]) {
rig_debug(RIG_DEBUG_ERR, "%s: Data read mismatch: expected %d, got %d\n",
__func__, reply[4], ret);
+ return -RIG_EPROTO;
}
// Validate VFO status field index won't overflow
if (reply[4] < 13) { // Need at least 13 bytes to access reply[17]
rig_debug(RIG_DEBUG_ERR, "%s: Response too short for VFO data\n", __func__);
+ return -RIG_EPROTO;
}
// Validate VFO status value
if (reply[17] != 0 && reply[17] != 1) {
rig_debug(RIG_DEBUG_ERR, "%s: Invalid VFO status value %d\n", __func__, reply[17]);
+ return -RIG_EPROTO;
}
*vfo = (reply[17] == 1) ? RIG_VFO_B : RIG_VFO_A;
@@ -578,33 +564,39 @@ static int q900_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
int ret = read_block(rp, reply, 5);
if (ret < 0) {
rig_debug(RIG_DEBUG_ERR, "%s: Failed to read header\n", __func__);
+ return -RIG_ETIMEOUT;
}
// Validate data length
- if (reply[4] <= 0 || reply[4] > sizeof(reply) - 5) {
+ if (reply[4] == 0 || reply[4] > sizeof(reply) - 5) {
rig_debug(RIG_DEBUG_ERR, "%s: Invalid data length %d\n", __func__, reply[4]);
+ return -RIG_EPROTO;
}
// Read data section
ret = read_block(rp, &reply[5], reply[4]);
if (ret < 0) {
rig_debug(RIG_DEBUG_ERR, "%s: Failed to read data\n", __func__);
+ return -RIG_ETIMEOUT;
}
// Validate response length matches expected
if (ret != reply[4]) {
rig_debug(RIG_DEBUG_ERR, "%s: Data read mismatch: expected %d, got %d\n",
__func__, reply[4], ret);
+ return -RIG_EPROTO;
}
// Validate PTT status field index won't overflow
if (reply[4] < 2) { // Need at least 2 bytes to access reply[6]
rig_debug(RIG_DEBUG_ERR, "%s: Response too short for PTT data\n", __func__);
+ return -RIG_EPROTO;
}
// Validate PTT status value
if (reply[6] != 0 && reply[6] != 1) {
rig_debug(RIG_DEBUG_ERR, "%s: Invalid PTT status value %d\n", __func__, reply[6]);
+ return -RIG_EPROTO;
}
cachep->ptt = reply[6];
@@ -671,7 +663,7 @@ static int q900_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
}
// Validate data length
- if (reply[4] <= 0 || reply[4] > sizeof(reply) - 5) {
+ if (reply[4] == 0 || reply[4] > sizeof(reply) - 5) {
rig_debug(RIG_DEBUG_ERR, "%s: Invalid data length %d\n", __func__, reply[4]);
}
@@ -760,74 +752,67 @@ static int q900_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
hamlib_port_t *rp = RIGPORT(rig);
unsigned char cmd[10] = { 0xa5, 0xa5, 0xa5, 0xa5, 5, 0x0a, 0x00, 0x00, 0x00, 0x00 };
unsigned char reply[10];
- int crc;
unsigned char i = rmode2guohe(mode, q900_modes);
-
- if (i != (-1))
+
+ if (vfo == RIG_VFO_B)
{
- if (vfo == RIG_VFO_B)
- {
- cmd[6] = rmode2guohe(CACHE(rig)->modeMainA, q900_modes);
- cmd[7] = i;
- }
- else
- {
- cmd[6] = i;
- cmd[7] = rmode2guohe(CACHE(rig)->modeMainB, q900_modes);
- }
-
- crc = CRC16Check(&cmd[4], 4);
- cmd[8] = crc >> 8;
- cmd[9] = crc & 0xff;
- rig_flush(rp);
- write_block(rp, cmd, 10);
-
- // Read header
- int ret = read_block(rp, reply, 5);
- if (ret < 0) {
- rig_debug(RIG_DEBUG_ERR, "%s: read_block failed for header\n", __func__);
- }
-
- // Validate data length
- if (reply[4] <= 0 || reply[4] > sizeof(reply) - 5) {
- rig_debug(RIG_DEBUG_ERR, "%s: invalid reply length %d\n", __func__, reply[4]);
- }
-
- // Read data section
- ret = read_block(rp, &reply[5], reply[4]);
- if (ret < 0) {
- rig_debug(RIG_DEBUG_ERR, "%s: read_block failed for data\n", __func__);
- }
-
- // Validate response length matches expected
- if (ret != reply[4]) {
- rig_debug(RIG_DEBUG_ERR, "%s: Data read mismatch: expected %d, got %d\n",
- __func__, reply[4], ret);
- }
-
- // Validate mode field index won't overflow
- if (reply[4] < 3) { // Need at least 3 bytes to access reply[6] and reply[7]
- rig_debug(RIG_DEBUG_ERR, "%s: Response too short for mode data\n", __func__);
- }
-
- // Validate mode field indices are within bounds
- if (reply[6] >= GUOHE_MODE_TABLE_MAX) {
- rig_debug(RIG_DEBUG_ERR, "%s: Invalid mode A index %d\n", __func__, reply[6]);
- }
-
- if (reply[7] >= GUOHE_MODE_TABLE_MAX) {
- rig_debug(RIG_DEBUG_ERR, "%s: Invalid mode B index %d\n", __func__, reply[7]);
- }
-
- dump_hex(reply, reply[4] + 5);
-
- CACHE(rig)->modeMainA = guohe2rmode(reply[6], q900_modes);
- CACHE(rig)->modeMainB = guohe2rmode(reply[7], q900_modes);
+ cmd[6] = rmode2guohe(CACHE(rig)->modeMainA, q900_modes);
+ cmd[7] = i;
+ }
+ else
+ {
+ cmd[6] = i;
+ cmd[7] = rmode2guohe(CACHE(rig)->modeMainB, q900_modes);
+ }
- return RIG_OK;
+ int crc = CRC16Check(&cmd[4], 4);
+ cmd[8] = crc >> 8;
+ cmd[9] = crc & 0xff;
+ rig_flush(rp);
+ write_block(rp, cmd, 10);
+
+ // Read header
+ int ret = read_block(rp, reply, 5);
+ if (ret < 0) {
+ rig_debug(RIG_DEBUG_ERR, "%s: read_block failed for header\n", __func__);
}
-
- rig_debug(RIG_DEBUG_ERR, "%s: invalid mode=%s\n", __func__, rig_strrmode(mode));
+
+ // Validate data length
+ if (reply[4] == 0 || reply[4] > sizeof(reply) - 5) {
+ rig_debug(RIG_DEBUG_ERR, "%s: invalid reply length %d\n", __func__, reply[4]);
+ }
+
+ // Read data section
+ ret = read_block(rp, &reply[5], reply[4]);
+ if (ret < 0) {
+ rig_debug(RIG_DEBUG_ERR, "%s: read_block failed for data\n", __func__);
+ }
+
+ // Validate response length matches expected
+ if (ret != reply[4]) {
+ rig_debug(RIG_DEBUG_ERR, "%s: Data read mismatch: expected %d, got %d\n",
+ __func__, reply[4], ret);
+ }
+
+ // Validate mode field index won't overflow
+ if (reply[4] < 3) { // Need at least 3 bytes to access reply[6] and reply[7]
+ rig_debug(RIG_DEBUG_ERR, "%s: Response too short for mode data\n", __func__);
+ }
+
+ // Validate mode field indices are within bounds
+ if (reply[6] >= GUOHE_MODE_TABLE_MAX) {
+ rig_debug(RIG_DEBUG_ERR, "%s: Invalid mode A index %d\n", __func__, reply[6]);
+ }
+
+ if (reply[7] >= GUOHE_MODE_TABLE_MAX) {
+ rig_debug(RIG_DEBUG_ERR, "%s: Invalid mode B index %d\n", __func__, reply[7]);
+ }
+
+ dump_hex(reply, reply[4] + 5);
+
+ CACHE(rig)->modeMainA = guohe2rmode(reply[6], q900_modes);
+ CACHE(rig)->modeMainB = guohe2rmode(reply[7], q900_modes);
+
return RIG_OK;
}
@@ -846,10 +831,7 @@ static int q900_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
cmd[8] = crc & 0xff;
unsigned char reply[9];
- int ret = q900_send(rig, cmd, sizeof(cmd), reply, sizeof(reply));
- if (ret != RIG_OK) {
- rig_debug(RIG_DEBUG_ERR, "%s: PTT command failed\n", __func__);
- }
+ q900_send(rig, cmd, sizeof(cmd), reply, sizeof(reply));
// Update cache
CACHE(rig)->ptt = ptt;
-----------------------------------------------------------------------
Summary of changes:
NEWS | 5 ++
rigs/guohetec/guohetec.c | 20 +----
rigs/guohetec/pmr171.c | 148 +++++++++++++++---------------------
rigs/guohetec/q900.c | 192 +++++++++++++++++++++--------------------------
4 files changed, 154 insertions(+), 211 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
