kopia lustrzana https://github.com/Hamlib/Hamlib
rodzic
76a3ab19eb
commit
a47eba7ce4
1
NEWS
1
NEWS
|
@ -25,7 +25,6 @@ Version 4.6
|
||||||
* Fix FTDX3000 rig split
|
* Fix FTDX3000 rig split
|
||||||
|
|
||||||
Version 4.5.5
|
Version 4.5.5
|
||||||
* Fix QRP QDX PTT to new TQ command
|
|
||||||
* Remove EX103 check for FTDX5000
|
* Remove EX103 check for FTDX5000
|
||||||
* Fix K3/K3S VFOB setting of mode/width
|
* Fix K3/K3S VFOB setting of mode/width
|
||||||
* Fix AGC level display in rigctld
|
* Fix AGC level display in rigctld
|
||||||
|
|
|
@ -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
|
// also a problem with Flex 6xxx and Log4OM not working due to lack of PS command
|
||||||
rig_debug(RIG_DEBUG_VERBOSE,
|
rig_debug(RIG_DEBUG_VERBOSE,
|
||||||
"%s: PS command failed (ret=%d) so returning RIG_POWER_ON\n", __func__, ret);
|
"%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;
|
*status = RIG_POWER_ON;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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
|
// 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
|
// 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);
|
hl_usleep(1200000);
|
||||||
|
|
||||||
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "%s%c", command, cat_term);
|
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "%s%c", command, cat_term);
|
||||||
|
|
|
@ -104,11 +104,11 @@ int main(int argc, char *argv[])
|
||||||
|
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
start:
|
|
||||||
if (getmyline(fd, buf))
|
if (getmyline(fd, buf))
|
||||||
{
|
{
|
||||||
printf("Cmd:%s\n", buf);
|
printf("Cmd:%s\n", buf);
|
||||||
}
|
}
|
||||||
|
else { continue; }
|
||||||
|
|
||||||
if (strcmp(buf, "RM5;") == 0)
|
if (strcmp(buf, "RM5;") == 0)
|
||||||
{
|
{
|
||||||
|
@ -172,10 +172,8 @@ int main(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
else if (strcmp(buf, "PS;") == 0)
|
else if (strcmp(buf, "PS;") == 0)
|
||||||
{
|
{
|
||||||
#if 0
|
SNPRINTF(buf, sizeof(buf), "PS1;");
|
||||||
SNPRINTF(buf, sizeof(buf), "PS0;");
|
|
||||||
n = write(fd, buf, strlen(buf));
|
n = write(fd, buf, strlen(buf));
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else if (strcmp(buf, "AI;") == 0)
|
else if (strcmp(buf, "AI;") == 0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -6079,7 +6079,6 @@ int HAMLIB_API rig_get_powerstat(RIG *rig, powerstat_t *status)
|
||||||
|
|
||||||
if (rig->caps->get_powerstat == NULL)
|
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
|
*status = RIG_POWER_ON; // default to power if not available
|
||||||
RETURNFUNC(RIG_OK);
|
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
|
*status = RIG_POWER_OFF; // default now to power off until proven otherwise in get_powerstat
|
||||||
HAMLIB_TRACE;
|
HAMLIB_TRACE;
|
||||||
retcode = rig->caps->get_powerstat(rig, status);
|
retcode = rig->caps->get_powerstat(rig, status);
|
||||||
if (retcode == -RIG_ETIMEOUT) status = RIG_POWER_OFF;
|
|
||||||
RETURNFUNC(retcode);
|
RETURNFUNC(retcode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4741,7 +4741,7 @@ declare_proto_rig(get_powerstat)
|
||||||
|
|
||||||
if (status != RIG_OK)
|
if (status != RIG_OK)
|
||||||
{
|
{
|
||||||
stat = status;
|
RETURNFUNC(status);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((interactive && prompt) || (interactive && !prompt && ext_resp))
|
if ((interactive && prompt) || (interactive && !prompt && ext_resp))
|
||||||
|
|
Ładowanie…
Reference in New Issue