kopia lustrzana https://github.com/Hamlib/Hamlib
Fix icom2rig_mode to allow PKT modees
rodzic
9f83fd1102
commit
ea81886fd5
11
icom/frame.c
11
icom/frame.c
|
@ -166,7 +166,9 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd,
|
|||
Unhold_Decode(rig);
|
||||
return retval;
|
||||
}
|
||||
if (retval < 1) {
|
||||
|
||||
if (retval < 1)
|
||||
{
|
||||
return -RIG_EPROTO;
|
||||
}
|
||||
|
||||
|
@ -230,7 +232,9 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd,
|
|||
/* other error: return it */
|
||||
return frm_len;
|
||||
}
|
||||
if (frm_len < 1) {
|
||||
|
||||
if (frm_len < 1)
|
||||
{
|
||||
return -RIG_EPROTO;
|
||||
}
|
||||
|
||||
|
@ -466,6 +470,9 @@ void icom2rig_mode(RIG *rig, unsigned char md, int pd, rmode_t *mode,
|
|||
{
|
||||
*width = RIG_PASSBAND_NORMAL;
|
||||
|
||||
if (md == RIG_MODE_PKTUSB) { md = RIG_MODE_USB; }
|
||||
else if (md == RIG_MODE_PKTLSB) { md = RIG_MODE_LSB; }
|
||||
|
||||
switch (md)
|
||||
{
|
||||
case S_AM: if (rig->caps->rig_model == RIG_MODEL_ICR30 && pd == 0x02)
|
||||
|
|
|
@ -1202,7 +1202,7 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
|
|||
}
|
||||
|
||||
if (filter_byte) { // then we need the width byte too
|
||||
rmode_t mode2;
|
||||
rmode_t mode2; // not used as it will map to USB/LSB
|
||||
pbwidth_t width2;
|
||||
icom2rig_mode(rig, mode, width, &mode2, &width2);
|
||||
datamode[1] = datamode[1] ? width2 : 0;
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#include <sys/time.h>
|
||||
#endif
|
||||
|
||||
#define BACKEND_VER "0.20"
|
||||
#define BACKEND_VER "0.21"
|
||||
|
||||
/*
|
||||
* defines used by comp_cal_str in rig.c
|
||||
|
|
Ładowanie…
Reference in New Issue