w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 12:23:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-2.3.0' into develop

Browse Source
This commit is contained in:
Bill Somerville 2021-01-15 21:54:14 +00:00
commit 63851911b5
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Transceiver/HamlibTransceiver.cpp
View File

@ -161,6 +161,7 @@ void HamlibTransceiver::register_transceivers (logger_type * logger,
{ {
rig_set_debug_callback (debug_callback, logger); rig_set_debug_callback (debug_callback, logger);
rig_set_debug (RIG_DEBUG_TRACE); rig_set_debug (RIG_DEBUG_TRACE);
BOOST_LOG_SEV (*logger, boost::log::trivial::info) << "Hamlib version: " << rig_version ();
rig_load_all_backends (); rig_load_all_backends ();
rig_list_foreach (register_callback, registry); rig_list_foreach (register_callback, registry);
} }

12
lib/wsprd/wsprd.c
View File

@ -738,7 +738,7 @@ int main(int argc, char *argv[])
signed char message[]={-9,13,-35,123,57,-39,64,0,0,0,0}; signed char message[]={-9,13,-35,123,57,-39,64,0,0,0,0};
char *callsign, *grid, *call_loc_pow; char *callsign, *grid, *call_loc_pow;
char *ptr_to_infile,*ptr_to_infile_suffix; char *ptr_to_infile,*ptr_to_infile_suffix;
char *data_dir=NULL; char *data_dir=".";
char wisdom_fname[200],all_fname[200],spots_fname[200]; char wisdom_fname[200],all_fname[200],spots_fname[200];
char timer_fname[200],hash_fname[200]; char timer_fname[200],hash_fname[200];
char uttime[5],date[7]; char uttime[5],date[7];
@ -905,11 +905,11 @@ int main(int argc, char *argv[])
strcpy(timer_fname,"."); strcpy(timer_fname,".");
strcpy(hash_fname,"."); strcpy(hash_fname,".");
if(data_dir != NULL) { if(data_dir != NULL) {
strcpy(wisdom_fname,data_dir); strncpy(wisdom_fname,data_dir, sizeof wisdom_fname);
strcpy(all_fname,data_dir); strncpy(all_fname,data_dir, sizeof all_fname);
strcpy(spots_fname,data_dir); strncpy(spots_fname,data_dir, sizeof spots_fname);
strcpy(timer_fname,data_dir); strncpy(timer_fname,data_dir, sizeof timer_fname);
strcpy(hash_fname,data_dir); strncpy(hash_fname,data_dir, sizeof hash_fname);
} }
strncat(wisdom_fname,"/wspr_wisdom.dat",20); strncat(wisdom_fname,"/wspr_wisdom.dat",20);
strncat(all_fname,"/ALL_WSPR.TXT",20); strncat(all_fname,"/ALL_WSPR.TXT",20);