diff --git a/NEWS b/NEWS index 7f618af64..378ee2923 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,6 @@ Version 4.6 * Fix FTDX3000 rig split Version 4.5.5 - * Fix QRP QDX PTT to new TQ command * Remove EX103 check for FTDX5000 * Fix K3/K3S VFOB setting of mode/width * Fix AGC level display in rigctld diff --git a/rigs/dummy/netrigctl.c b/rigs/dummy/netrigctl.c index c4e90efb3..b69e04b68 100644 --- a/rigs/dummy/netrigctl.c +++ b/rigs/dummy/netrigctl.c @@ -2065,9 +2065,6 @@ static int netrigctl_get_powerstat(RIG *rig, powerstat_t *status) // also a problem with Flex 6xxx and Log4OM not working due to lack of PS command rig_debug(RIG_DEBUG_VERBOSE, "%s: PS command failed (ret=%d) so returning RIG_POWER_ON\n", __func__, ret); - if (ret == -RIG_EPOWER) - *status = RIG_POWER_OFF; - else *status = RIG_POWER_ON; } diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index b491a1c9f..10ea9b1fa 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -3622,7 +3622,7 @@ int newcat_get_powerstat(RIG *rig, powerstat_t *status) // when not powered on need a dummy byte to wake it up // then sleep from 1 to 2 seconds so we'll do 1.5 secs - write_block(&state->rigport, (unsigned char *) ";;;", 3); + write_block(&state->rigport, (unsigned char *) "PS;", 3); hl_usleep(1200000); SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "%s%c", command, cat_term); diff --git a/simulators/simft991.c b/simulators/simft991.c index 49f61d17b..965deb4f2 100644 --- a/simulators/simft991.c +++ b/simulators/simft991.c @@ -104,11 +104,11 @@ int main(int argc, char *argv[]) while (1) { - start: if (getmyline(fd, buf)) { printf("Cmd:%s\n", buf); } + else { continue; } if (strcmp(buf, "RM5;") == 0) { @@ -172,10 +172,8 @@ int main(int argc, char *argv[]) } else if (strcmp(buf, "PS;") == 0) { -#if 0 - SNPRINTF(buf, sizeof(buf), "PS0;"); + SNPRINTF(buf, sizeof(buf), "PS1;"); n = write(fd, buf, strlen(buf)); -#endif } else if (strcmp(buf, "AI;") == 0) { diff --git a/src/rig.c b/src/rig.c index 68104894e..65927287e 100644 --- a/src/rig.c +++ b/src/rig.c @@ -6079,7 +6079,6 @@ int HAMLIB_API rig_get_powerstat(RIG *rig, powerstat_t *status) if (rig->caps->get_powerstat == NULL) { - rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig does not have get_powerstat to assume RIG_POWER_ON\n", __func__); *status = RIG_POWER_ON; // default to power if not available RETURNFUNC(RIG_OK); } @@ -6087,7 +6086,6 @@ int HAMLIB_API rig_get_powerstat(RIG *rig, powerstat_t *status) *status = RIG_POWER_OFF; // default now to power off until proven otherwise in get_powerstat HAMLIB_TRACE; retcode = rig->caps->get_powerstat(rig, status); - if (retcode == -RIG_ETIMEOUT) status = RIG_POWER_OFF; RETURNFUNC(retcode); } diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c index 9cefcb0a8..02c801951 100644 --- a/tests/rigctl_parse.c +++ b/tests/rigctl_parse.c @@ -4741,7 +4741,7 @@ declare_proto_rig(get_powerstat) if (status != RIG_OK) { - stat = status; + RETURNFUNC(status); } if ((interactive && prompt) || (interactive && !prompt && ext_resp))