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

rigs/kenwood/ts950.c

@@ -74,8 +74,8 @@ const struct rig_caps ts950s_caps =
     .serial_parity =  RIG_PARITY_NONE,
     .serial_handshake =  RIG_HANDSHAKE_NONE,
     .write_delay =  0,
-    .post_write_delay =  0,
-    .timeout =  500, // this rig takes over 250ms to respond an IF command
+    .post_write_delay =  50,
+    .timeout =  600, // this rig takes over 250ms to respond an IF command
     .retry =  10,
 
     .has_get_func =  RIG_FUNC_NONE,

src/debug.c

@@ -150,10 +150,12 @@ char *date_strget(char *buf, int buflen)
 {
     char tmp[16];
     struct tm *mytm;
+    time_t t;
     struct timeval tv;
-    gettimeofday(&tv, NULL);
-    mytm = gmtime(&tv.tv_sec);
+    t = time(NULL);
+    mytm = gmtime(&t);
     strftime(buf, buflen, "%Y-%m-%d:%H:%M:%S.", mytm);
+    gettimeofday(&tv, NULL);
     sprintf(tmp, "%06ld", (long)tv.tv_usec);
     strcat(buf, tmp);
     return buf;