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

Merge branch 'master' of https://github.com/Hamlib/Hamlib

pull/103/head
Michael Black 2019-05-13 07:04:08 -05:00
rodzic 5adf6a5951 56ee4fd18a
commit 8329e50f01
3 zmienionych plików z 9 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
lib/termios.c
Wyświetl plik

@ -3347,7 +3347,7 @@ fail:
report( message ); report( message );
errno = EBADFD; errno = EBADFD;
LEAVE( "serial_select" ); LEAVE( "serial_select" );
return( 1 ); return( -1 );
} }
#ifdef asdf #ifdef asdf
int win32_serial_select( int n, fd_set *readfds, fd_set *writefds, int win32_serial_select( int n, fd_set *readfds, fd_set *writefds,

1
tentec/orion.c
Wyświetl plik

@ -127,6 +127,7 @@ static int tt565_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
/* Allow transaction re-tries according to capabilities. */ /* Allow transaction re-tries according to capabilities. */
for (itry=0; itry < rig->caps->retry; itry++) { for (itry=0; itry < rig->caps->retry; itry++) {
rs = &rig->state; rs = &rig->state;
serial_flush(&rs->rigport); /* discard pending i/p */
retval = write_block(&rs->rigport, cmd, cmd_len); retval = write_block(&rs->rigport, cmd, cmd_len);
if (retval != RIG_OK) if (retval != RIG_OK)
return retval; return retval;

14
tentec/orion.h
Wyświetl plik

@ -193,7 +193,7 @@ const struct rig_caps tt565_caps = {
.rig_model = RIG_MODEL_TT565, .rig_model = RIG_MODEL_TT565,
.model_name = "TT-565 Orion", .model_name = "TT-565 Orion",
.mfg_name = "Ten-Tec", .mfg_name = "Ten-Tec",
.version = "0.5", .version = "0.6",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_BETA, .status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -207,8 +207,8 @@ const struct rig_caps tt565_caps = {
.serial_parity = RIG_PARITY_NONE, .serial_parity = RIG_PARITY_NONE,
.serial_handshake = RIG_HANDSHAKE_HARDWARE, .serial_handshake = RIG_HANDSHAKE_HARDWARE,
.write_delay = 0, /* no delay between characters written */ .write_delay = 0, /* no delay between characters written */
.post_write_delay = 10, /* ms delay between writes DEBUGGING HERE */ .post_write_delay = 0, /* ms delay between writes DEBUGGING HERE */
.timeout = 200, /* ms */ .timeout = 2000, /* ms */
.retry = 4, .retry = 4,
.has_get_func = TT565_FUNCS, .has_get_func = TT565_FUNCS,
@ -410,7 +410,7 @@ const struct rig_caps tt599_caps = {
.rig_model = RIG_MODEL_TT599, .rig_model = RIG_MODEL_TT599,
.model_name = "TT-599 Eagle", .model_name = "TT-599 Eagle",
.mfg_name = "Ten-Tec", .mfg_name = "Ten-Tec",
.version = "0.4", .version = "0.5",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_UNTESTED, .status = RIG_STATUS_UNTESTED,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -424,9 +424,9 @@ const struct rig_caps tt599_caps = {
.serial_parity = RIG_PARITY_NONE, .serial_parity = RIG_PARITY_NONE,
.serial_handshake = RIG_HANDSHAKE_HARDWARE, .serial_handshake = RIG_HANDSHAKE_HARDWARE,
.write_delay = 0, /* no delay between characters written */ .write_delay = 0, /* no delay between characters written */
.post_write_delay = 10, /* ms delay between writes DEBUGGING HERE */ .post_write_delay = 0, /* ms delay between writes DEBUGGING HERE */
.timeout = 200, /* ms */ .timeout = 2000, /* ms */
.retry = 3, .retry = 4,
.has_get_func = TT599_FUNCS, .has_get_func = TT599_FUNCS,
.has_set_func = TT599_FUNCS, .has_set_func = TT599_FUNCS,