From fc3c2d5c2a032b6808011513466e6b785f50bca7 Mon Sep 17 00:00:00 2001 From: mdblack98 Date: Fri, 24 Apr 2020 14:16:33 -0500 Subject: [PATCH 1/3] https://github.com/Hamlib/Hamlib/issues/223 Fix gs232a/b null data requests now do not expect a reply --- rotators/gs232a/gs232a.c | 5 +++-- rotators/gs232a/gs232b.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/rotators/gs232a/gs232a.c b/rotators/gs232a/gs232a.c index 12024ab45..69aa682d5 100644 --- a/rotators/gs232a/gs232a.c +++ b/rotators/gs232a/gs232a.c @@ -82,10 +82,11 @@ transaction_write: } } - /* Always read the reply to know whether the cmd went OK */ + /* If no data requested just return */ if (!data) { data = replybuf; + return RIG_OK; } if (!data_len) @@ -294,7 +295,7 @@ const struct rot_caps gs23_rot_caps = ROT_MODEL(ROT_MODEL_GS23), .model_name = "GS-23", .mfg_name = "Yaesu/Kenpro", - .version = "0.2", + .version = "20200424", .copyright = "LGPL", .status = RIG_STATUS_ALPHA, .rot_type = ROT_TYPE_AZEL, diff --git a/rotators/gs232a/gs232b.c b/rotators/gs232a/gs232b.c index 483f5c9a8..bb83f2dd1 100644 --- a/rotators/gs232a/gs232b.c +++ b/rotators/gs232a/gs232b.c @@ -90,10 +90,10 @@ transaction_write: if (no_reply) { return RIG_OK; } // nothing expected so return - /* Always read the reply to know whether the cmd went OK */ + /* If no data requested just return */ if (!data) { - data = replybuf; + return RIG_OK; } if (!data_len) @@ -313,7 +313,7 @@ const struct rot_caps gs232b_rot_caps = ROT_MODEL(ROT_MODEL_GS232B), .model_name = "GS-232B", .mfg_name = "Yaesu", - .version = "0.5", + .version = "20200424", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rot_type = ROT_TYPE_OTHER, From a2465033de26027e63ba3e09bbb6f08b45634e9e Mon Sep 17 00:00:00 2001 From: mdblack98 Date: Fri, 24 Apr 2020 14:18:09 -0500 Subject: [PATCH 2/3] https://github.com/Hamlib/Hamlib/issues/223 Do the same fix for gs232 to honor null data returns --- rotators/gs232a/gs232.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rotators/gs232a/gs232.c b/rotators/gs232a/gs232.c index 19d2ad613..7c04d99c3 100644 --- a/rotators/gs232a/gs232.c +++ b/rotators/gs232a/gs232.c @@ -85,7 +85,7 @@ transaction_write: /* Always read the reply to know whether the cmd went OK */ if (!data) { - data = replybuf; + return RIG_OK; } if (!data_len) @@ -244,7 +244,7 @@ const struct rot_caps gs232_generic_rot_caps = ROT_MODEL(ROT_MODEL_GS232_GENERIC), .model_name = "GS-232 Generic", .mfg_name = "Various", - .version = "0.3", + .version = "20200424", .copyright = "LGPL", .status = RIG_STATUS_BETA, .rot_type = ROT_TYPE_AZEL, From f5c09a79076f68fcb979827258d049a59f10fd21 Mon Sep 17 00:00:00 2001 From: mdblack98 Date: Fri, 24 Apr 2020 15:45:40 -0500 Subject: [PATCH 3/3] Remove unused in gs232.c --- rotators/gs232a/gs232.c | 1 - 1 file changed, 1 deletion(-) diff --git a/rotators/gs232a/gs232.c b/rotators/gs232a/gs232.c index 7c04d99c3..eabda1ae5 100644 --- a/rotators/gs232a/gs232.c +++ b/rotators/gs232a/gs232.c @@ -64,7 +64,6 @@ gs232_transaction(ROT *rot, const char *cmdstr, struct rot_state *rs; int retval; int retry_read = 0; - char replybuf[BUFSZ]; rs = &rot->state;