kopia lustrzana https://github.com/Hamlib/Hamlib
Move ELAPSED macros to rig.h for global use
Add ELAPSED to get_vfo_info in rigctl_parse.cpull/891/head
rodzic
16976641e7
commit
07cac7be76
|
@ -3095,6 +3095,11 @@ extern HAMLIB_EXPORT_VAR(char) debugmsgsave3[DEBUGMSGSAVE_SIZE]; // last-2 debu
|
|||
#define rig_debug(debug_level,fmt,...) do { strncpy(debugmsgsave3, debugmsgsave2,sizeof(debugmsgsave3));strncpy(debugmsgsave2, debugmsgsave, sizeof(debugmsgsave2));snprintf(debugmsgsave,sizeof(debugmsgsave),fmt,__VA_ARGS__);rig_debug(debug_level,fmt,##__VA_ARGS__); } while(0);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// Measuring elapsed time -- local variable inside function when macro is used
|
||||
#define ELAPSED1 struct timespec __begin; elapsed_ms(&__begin, HAMLIB_ELAPSED_SET);
|
||||
#define ELAPSED2 rig_debug(RIG_DEBUG_TRACE, "%s: elapsed=%.0lfms\n", __func__, elapsed_ms(&__begin, HAMLIB_ELAPSED_GET));
|
||||
|
||||
extern HAMLIB_EXPORT(void)
|
||||
rig_debug HAMLIB_PARAMS((enum rig_debug_level_e debug_level,
|
||||
const char *fmt, ...));
|
||||
|
|
|
@ -157,9 +157,6 @@ const char hamlib_copyright[231] = /* hamlib 1.2 ABI specifies 231 bytes */
|
|||
|
||||
#define CHECK_RIG_ARG(r) (!(r) || !(r)->caps || !(r)->state.comm_state)
|
||||
|
||||
#define ELAPSED1 struct timespec __begin; elapsed_ms(&__begin, HAMLIB_ELAPSED_SET);
|
||||
#define ELAPSED2 rig_debug(RIG_DEBUG_TRACE, "%s: elapsed=%.0lfms\n", __func__, elapsed_ms(&__begin, HAMLIB_ELAPSED_GET));
|
||||
|
||||
#define LOCK \
|
||||
|
||||
/*
|
||||
|
|
|
@ -2262,6 +2262,7 @@ declare_proto_rig(get_vfo_info)
|
|||
int retval;
|
||||
|
||||
ENTERFUNC;
|
||||
ELAPSED1;
|
||||
|
||||
if (!strcmp(arg1, "?"))
|
||||
{
|
||||
|
@ -2301,6 +2302,7 @@ declare_proto_rig(get_vfo_info)
|
|||
fprintf(fout, "%.0f\n%s\n%d\n", freq, modestr, (int)width);
|
||||
}
|
||||
|
||||
ELAPSED2;
|
||||
RETURNFUNC(retval);
|
||||
}
|
||||
|
||||
|
@ -5230,9 +5232,11 @@ declare_proto_rig(set_clock)
|
|||
(unsigned)abs(utc_offset));
|
||||
|
||||
rig_debug(RIG_DEBUG_ERR, "%s: utc_offset=%d\n", __func__, utc_offset);
|
||||
if (utc_offset < 24) utc_offset *= 100; // allow for minutes offset too
|
||||
|
||||
if (utc_offset < 24) { utc_offset *= 100; } // allow for minutes offset too
|
||||
|
||||
rig_debug(RIG_DEBUG_ERR, "%s: utc_offset=%d\n", __func__, utc_offset);
|
||||
|
||||
|
||||
RETURNFUNC(rig_set_clock(rig, year, mon, day, hour, min, sec, msec,
|
||||
utc_offset));
|
||||
}
|
||||
|
@ -5254,7 +5258,7 @@ declare_proto_rig(get_clock)
|
|||
aoffset = abs(utc_offset);
|
||||
fprintf(fout, "%04d-%02d-%02dT%02d:%02d:%06.3f%s%02d:%02d\n", year, month, day,
|
||||
hour, min, sec + msec / 1000, utc_offset >= 0 ? "+" : "-",
|
||||
aoffset/100, aoffset % 100);
|
||||
aoffset / 100, aoffset % 100);
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
|
Ładowanie…
Reference in New Issue