mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Add deprecated port references to amp and rot conf

pull/950/head
Mike Black W9MDB 2022-01-31 22:12:29 -06:00
rodzic 668147885f
commit f6941437ba
2 zmienionych plików z 30 dodań i 0 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
src/amp_conf.c
Wyświetl plik

@ -146,6 +146,7 @@ int frontamp_set_conf(AMP *amp, token_t token, const char *val)
{
case TOK_PATHNAME:
strncpy(rs->ampport.pathname, val, HAMLIB_FILPATHLEN - 1);
strncpy(rs->ampport_deprecated.pathname, val, HAMLIB_FILPATHLEN - 1);
break;
case TOK_WRITE_DELAY:
@ -155,6 +156,7 @@ int frontamp_set_conf(AMP *amp, token_t token, const char *val)
}
rs->ampport.write_delay = val_i;
rs->ampport_deprecated.write_delay = val_i;
break;
case TOK_POST_WRITE_DELAY:
@ -164,6 +166,7 @@ int frontamp_set_conf(AMP *amp, token_t token, const char *val)
}
rs->ampport.post_write_delay = val_i;
rs->ampport_deprecated.post_write_delay = val_i;
break;
case TOK_TIMEOUT:
@ -173,6 +176,7 @@ int frontamp_set_conf(AMP *amp, token_t token, const char *val)
}
rs->ampport.timeout = val_i;
rs->ampport_deprecated.timeout = val_i;
break;
case TOK_RETRY:
@ -182,6 +186,7 @@ int frontamp_set_conf(AMP *amp, token_t token, const char *val)
}
rs->ampport.retry = val_i;
rs->ampport_deprecated.retry = val_i;
break;
case TOK_SERIAL_SPEED:
@ -196,6 +201,7 @@ int frontamp_set_conf(AMP *amp, token_t token, const char *val)
}
rs->ampport.parm.serial.rate = val_i;
rs->ampport_deprecated.parm.serial.rate = val_i;
break;
case TOK_DATA_BITS:
@ -210,6 +216,7 @@ int frontamp_set_conf(AMP *amp, token_t token, const char *val)
}
rs->ampport.parm.serial.data_bits = val_i;
rs->ampport_deprecated.parm.serial.data_bits = val_i;
break;
case TOK_STOP_BITS:
@ -224,6 +231,7 @@ int frontamp_set_conf(AMP *amp, token_t token, const char *val)
}
rs->ampport.parm.serial.stop_bits = val_i;
rs->ampport_deprecated.parm.serial.stop_bits = val_i;
break;
case TOK_PARITY:
@ -235,22 +243,27 @@ int frontamp_set_conf(AMP *amp, token_t token, const char *val)
if (!strcmp(val, "None"))
{
rs->ampport.parm.serial.parity = RIG_PARITY_NONE;
rs->ampport_deprecated.parm.serial.parity = RIG_PARITY_NONE;
}
else if (!strcmp(val, "Odd"))
{
rs->ampport.parm.serial.parity = RIG_PARITY_ODD;
rs->ampport_deprecated.parm.serial.parity = RIG_PARITY_ODD;
}
else if (!strcmp(val, "Even"))
{
rs->ampport.parm.serial.parity = RIG_PARITY_EVEN;
rs->ampport_deprecated.parm.serial.parity = RIG_PARITY_EVEN;
}
else if (!strcmp(val, "Mark"))
{
rs->ampport.parm.serial.parity = RIG_PARITY_MARK;
rs->ampport_deprecated.parm.serial.parity = RIG_PARITY_MARK;
}
else if (!strcmp(val, "Space"))
{
rs->ampport.parm.serial.parity = RIG_PARITY_SPACE;
rs->ampport_deprecated.parm.serial.parity = RIG_PARITY_SPACE;
}
else
{

17
src/rot_conf.c
Wyświetl plik

@ -178,6 +178,7 @@ int frontrot_set_conf(ROT *rot, token_t token, const char *val)
{
case TOK_PATHNAME:
strncpy(rs->rotport.pathname, val, HAMLIB_FILPATHLEN - 1);
strncpy(rs->rotport_deprecated.pathname, val, HAMLIB_FILPATHLEN - 1);
break;
case TOK_WRITE_DELAY:
@ -187,6 +188,7 @@ int frontrot_set_conf(ROT *rot, token_t token, const char *val)
}
rs->rotport.write_delay = val_i;
rs->rotport_deprecated.write_delay = val_i;
break;
case TOK_POST_WRITE_DELAY:
@ -196,6 +198,7 @@ int frontrot_set_conf(ROT *rot, token_t token, const char *val)
}
rs->rotport.post_write_delay = val_i;
rs->rotport_deprecated.post_write_delay = val_i;
break;
case TOK_TIMEOUT:
@ -205,6 +208,7 @@ int frontrot_set_conf(ROT *rot, token_t token, const char *val)
}
rs->rotport.timeout = val_i;
rs->rotport_deprecated.timeout = val_i;
break;
case TOK_RETRY:
@ -214,6 +218,7 @@ int frontrot_set_conf(ROT *rot, token_t token, const char *val)
}
rs->rotport.retry = val_i;
rs->rotport_deprecated.retry = val_i;
break;
case TOK_SERIAL_SPEED:
@ -228,6 +233,7 @@ int frontrot_set_conf(ROT *rot, token_t token, const char *val)
}
rs->rotport.parm.serial.rate = val_i;
rs->rotport_deprecated.parm.serial.rate = val_i;
break;
case TOK_DATA_BITS:
@ -242,6 +248,7 @@ int frontrot_set_conf(ROT *rot, token_t token, const char *val)
}
rs->rotport.parm.serial.data_bits = val_i;
rs->rotport_deprecated.parm.serial.data_bits = val_i;
break;
case TOK_STOP_BITS:
@ -256,6 +263,7 @@ int frontrot_set_conf(ROT *rot, token_t token, const char *val)
}
rs->rotport.parm.serial.stop_bits = val_i;
rs->rotport_deprecated.parm.serial.stop_bits = val_i;
break;
case TOK_PARITY:
@ -267,22 +275,27 @@ int frontrot_set_conf(ROT *rot, token_t token, const char *val)
if (!strcmp(val, "None"))
{
rs->rotport.parm.serial.parity = RIG_PARITY_NONE;
rs->rotport_deprecated.parm.serial.parity = RIG_PARITY_NONE;
}
else if (!strcmp(val, "Odd"))
{
rs->rotport.parm.serial.parity = RIG_PARITY_ODD;
rs->rotport_deprecated.parm.serial.parity = RIG_PARITY_ODD;
}
else if (!strcmp(val, "Even"))
{
rs->rotport.parm.serial.parity = RIG_PARITY_EVEN;
rs->rotport_deprecated.parm.serial.parity = RIG_PARITY_EVEN;
}
else if (!strcmp(val, "Mark"))
{
rs->rotport.parm.serial.parity = RIG_PARITY_MARK;
rs->rotport_deprecated.parm.serial.parity = RIG_PARITY_MARK;
}
else if (!strcmp(val, "Space"))
{
rs->rotport.parm.serial.parity = RIG_PARITY_SPACE;
rs->rotport_deprecated.parm.serial.parity = RIG_PARITY_SPACE;
}
else
{
@ -300,14 +313,17 @@ int frontrot_set_conf(ROT *rot, token_t token, const char *val)
if (!strcmp(val, "None"))
{
rs->rotport.parm.serial.handshake = RIG_HANDSHAKE_NONE;
rs->rotport_deprecated.parm.serial.handshake = RIG_HANDSHAKE_NONE;
}
else if (!strcmp(val, "XONXOFF"))
{
rs->rotport.parm.serial.handshake = RIG_HANDSHAKE_XONXOFF;
rs->rotport_deprecated.parm.serial.handshake = RIG_HANDSHAKE_XONXOFF;
}
else if (!strcmp(val, "Hardware"))
{
rs->rotport.parm.serial.handshake = RIG_HANDSHAKE_HARDWARE;
rs->rotport_deprecated.parm.serial.handshake = RIG_HANDSHAKE_HARDWARE;
}
else
{
@ -318,6 +334,7 @@ int frontrot_set_conf(ROT *rot, token_t token, const char *val)
case TOK_FLUSHX:
rs->rotport.flushx = atoi(val);
rs->rotport_deprecated.flushx = atoi(val);
break;
case TOK_MIN_AZ: