kopia lustrzana https://github.com/Hamlib/Hamlib
Reorder newcat_band_index to return 15 for 2M band instead of 14
https://github.com/Hamlib/Hamlib/issues/470pull/474/head
rodzic
e5b7a5442d
commit
5a208a871d
|
@ -399,10 +399,10 @@ static int newcat_band_index(freq_t freq)
|
||||||
// does anybody work LSB or RTTYR at the upper band edge?
|
// does anybody work LSB or RTTYR at the upper band edge?
|
||||||
// what about band 13 -- what is it?
|
// what about band 13 -- what is it?
|
||||||
if (freq >= MHz(420) && freq < MHz(470)) { band = 16; }
|
if (freq >= MHz(420) && freq < MHz(470)) { band = 16; }
|
||||||
// band 14 is RX only
|
|
||||||
else if (freq >= MHz(118) && freq < MHz(164)) { band = 14; }
|
|
||||||
// override band 14 with 15 if needed
|
|
||||||
else if (freq >= MHz(144) && freq < MHz(148)) { band = 15; }
|
else if (freq >= MHz(144) && freq < MHz(148)) { band = 15; }
|
||||||
|
// band 14 is RX only
|
||||||
|
// override band 15 with 14 if needed
|
||||||
|
else if (freq >= MHz(118) && freq < MHz(164)) { band = 14; }
|
||||||
else if (freq >= MHz(70) && freq < MHz(70.5)) { band = 17; }
|
else if (freq >= MHz(70) && freq < MHz(70.5)) { band = 17; }
|
||||||
else if (freq >= MHz(50) && freq < MHz(55)) { band = 10; }
|
else if (freq >= MHz(50) && freq < MHz(55)) { band = 10; }
|
||||||
else if (freq >= MHz(28) && freq < MHz(29.7)) { band = 9; }
|
else if (freq >= MHz(28) && freq < MHz(29.7)) { band = 9; }
|
||||||
|
@ -9051,7 +9051,7 @@ int newcat_get_cmd(RIG *rig)
|
||||||
__func__, priv->ret_data);
|
__func__, priv->ret_data);
|
||||||
// we were using BUSBUSY but microham devices need retries
|
// we were using BUSBUSY but microham devices need retries
|
||||||
//rc = -RIG_BUSBUSY; /* don't write command again */
|
//rc = -RIG_BUSBUSY; /* don't write command again */
|
||||||
rc = -RIG_EPROTO;
|
// rc = -RIG_EPROTO;
|
||||||
/* we could decrement retry_count
|
/* we could decrement retry_count
|
||||||
here but there is a danger of
|
here but there is a danger of
|
||||||
infinite looping so we just use up
|
infinite looping so we just use up
|
||||||
|
|
|
@ -50,7 +50,7 @@
|
||||||
typedef char ncboolean;
|
typedef char ncboolean;
|
||||||
|
|
||||||
/* shared function version */
|
/* shared function version */
|
||||||
#define NEWCAT_VER "20201218"
|
#define NEWCAT_VER "20201219"
|
||||||
|
|
||||||
/* Hopefully large enough for future use, 128 chars plus '\0' */
|
/* Hopefully large enough for future use, 128 chars plus '\0' */
|
||||||
#define NEWCAT_DATA_LEN 129
|
#define NEWCAT_DATA_LEN 129
|
||||||
|
|
Ładowanie…
Reference in New Issue