From f7a0e4622bed9551bb0999d3c54bb69249065d38 Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Thu, 12 Oct 2017 19:43:15 +0200 Subject: Display channel offset with TX and RX channel frequencies on startup --- src/nmt/countries.c | 2 ++ src/nmt/main.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/nmt') diff --git a/src/nmt/countries.c b/src/nmt/countries.c index f2e58fd..957c563 100644 --- a/src/nmt/countries.c +++ b/src/nmt/countries.c @@ -254,6 +254,8 @@ double nmt_channel2freq(int nmt_system, const char *short_name, int channel, int for (j = 0; nmt_country[i].nmt_frequency[j].first_frequency; j++) { if (channel >= nmt_country[i].nmt_frequency[j].first_channel && channel <= nmt_country[i].nmt_frequency[j].last_channel) { + if (uplink == 2) + return -nmt_country[i].nmt_frequency[j].duplex_spacing * 1e6; /* add "channel offset" * "channel spacing" to "first frequency" */ freq = nmt_country[i].nmt_frequency[j].first_frequency; freq += (double)(channel - nmt_country[i].nmt_frequency[j].first_channel) * nmt_country[i].nmt_frequency[j].channel_spacing; diff --git a/src/nmt/main.c b/src/nmt/main.c index d6b5ed0..a2dcb23 100644 --- a/src/nmt/main.c +++ b/src/nmt/main.c @@ -410,7 +410,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "Failed to create transceiver instance. Quitting!\n"); goto fail; } - printf("base station on channel %d ready, please tune transmitter to %.4f MHz and receiver to %.4f MHz.\n", kanal[i], nmt_channel2freq(nmt_system, country, kanal[i], 0, NULL, NULL, NULL) / 1e6, nmt_channel2freq(nmt_system, country, kanal[i], 1, NULL, NULL, NULL) / 1e6); + printf("base station on channel %d ready, please tune transmitter to %.4f MHz and receiver to %.4f MHz. (%.3f MHz offset)\n", kanal[i], nmt_channel2freq(nmt_system, country, kanal[i], 0, NULL, NULL, NULL) / 1e6, nmt_channel2freq(nmt_system, country, kanal[i], 1, NULL, NULL, NULL) / 1e6, nmt_channel2freq(nmt_system, country, kanal[i], 2, NULL, NULL, NULL) / 1e6); } nmt_check_channels(nmt_system); -- cgit v1.2.3