Commit ad48cd83 authored by Peter Horvath's avatar Peter Horvath
Browse files

Change preferred qthfile.txt format

parent 096fce2f
......@@ -124,13 +124,13 @@ More details on these steps are given below.
## Specify your location
In order for smog_rtl_rx to calculate the Doppler compensation, the location of your station is required.
In order for smog1_rtl_rx to calculate the Doppler compensation, the location of your station is required.
Create a file called qthfile.txt with your geographical location in the same directory as `smog1_rtl_rx` is run from.
A sample [qthfile.txt](https://gitlab.com/phorvath/smogcli2/-/blob/master/qthfile.txt) is included for reference.
qthfile.txt should contain
- A free-form identifier (e.g., your callsign) - this will appear verbatim at the end of the file name in every recording
- Latitude in decimal format (N: positive value, S: negative value)
- Longitude in decimal format (E: negative value, W: positive value)
- Latitude in decimal format (xx.xxxxxxN or xx.xxxxxxS, e.g., 47.4775326N)
- Longitude in decimal format (xxx.xxxxxxE or xxx.xxxxxxW, e.g., 19.055378E)
- Altitude in meters
- Your BME username as obtained from the registration process at [link](https://gnd.bme.hu:8080/index)
- Your BME password
......@@ -271,7 +271,7 @@ This tool converts 16-bit WAV files to .cf32-format recordings, suitable e.g. fo
`smog1_rtl_rx` accepts an argument, `-d`, which allows the user to specify which rtl-sdr device to use.
This switch accepts different formats (the device ID: 0, 1, ...; or the serial number string, or
the beginning or end of a serial number string). `smog_rtl_rx` will automatically
the beginning or end of a serial number string). `smog1_rtl_rx` will automatically
append the device ID to the cf32 file name.
Don't run multiple `smog1_rtl_rx` instances from the same directory! TLE updates will
go wrong, or other horrible things might happen. Simply create separate directories for different
......
HA5MRC
47.4775326
-19.055378
47.4775326N
19.055378E
120
......@@ -1810,8 +1810,20 @@ int read_data_files(const long* catnums, const char** names, struct station_data
getline(qthfile, qth.callsign);
getline(qthfile, line);
qth.stnlat = std::stod(line);
if(line.back() == 'N' || line.back() == 'S') {
if(qth.stnlat < 0.0)
std::cerr << "WARNING: QTH latitude needs to be specified as xx.xxxxxxN or xx.xxxxxxS" << std::endl;
if(line.back() == 'S')
qth.stnlat = -qth.stnlat;
}
getline(qthfile, line);
qth.stnlong = std::stod(line);
if(line.back() == 'E' || line.back() == 'W') {
if(qth.stnlong < 0.0)
std::cerr << "WARNING: QTH longitude needs to be specified as xxx.xxxxxE or xxx.xxxxxW" << std::endl;
if(line.back() == 'E')
qth.stnlong = -qth.stnlong;
}
getline(qthfile, line);
qth.stnalt = std::stoi(line);
......@@ -2048,7 +2060,7 @@ double calc_tle_age()
{
PreCalc(0);
struct timeval tptr;
(void)gettimeofday(&tptr, NULL);
(void)gettimeofday(&tptr, nullptr);
double usecs = 0.000001 * (double)tptr.tv_usec;
double seconds = usecs + (double)tptr.tv_sec;
......
......@@ -194,7 +194,10 @@ int sat_tracker::read_files()
double tle_age_days = calc_tle_age();
PreCalc(0);
std::cerr << "INFO: TLE age is " << tle_age_days << " days" << std::endl;
std::cerr << "INFO: ground station latitude: " << station.stnlat << ' '
<< (station.stnlat > 0.0 ? 'N' : 'S') << std::endl;
std::cerr << "INFO: ground station longitude: " << abs(station.stnlong) << ' '
<< (station.stnlong > 0.0 ? 'W' : 'E') << std::endl;
tracking_possible = true;
return 0;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment