Display channel offset with TX and RX channel frequencies on startup

src/amps/amps.c

@@ -75,6 +75,9 @@ double amps_channel2freq(int channel, int uplink)
 	double freq;
 
 	if (!tacs) {
+		if (uplink == 2)
+			return -45.000 * 1e6;
+
 		/* 832 channels, 990 not used, see TIA/EIA-136-110 */
 		if (channel < 1 || channel > 1023 || (channel > 799 && channel < 991))
 			return 0;
@@ -87,6 +90,9 @@ double amps_channel2freq(int channel, int uplink)
 		if (uplink)
 			freq -= 45.000;
 	} else if (!jtacs) {
+		if (uplink == 2)
+			return -45.000 * 1e6;
+
 		/* 600 channels */
 		if (channel < 1 || channel > 600)
 			return 0;
@@ -96,6 +102,9 @@ double amps_channel2freq(int channel, int uplink)
 		if (uplink)
 			freq -= 45.000;
 	} else {
+		if (uplink == 2)
+			return -55.000 * 1e6;
+
 		/* 799 channels */
 		if (channel < 1 || channel > 799)
 			return 0;

src/amps/amps_tacs_main.c

@@ -397,9 +397,9 @@ int main_amps_tacs(int argc, char *argv[])
 			goto fail;
 		}
 		if (!tacs)
-			printf("Base station on channel %d ready (%s), please tune transmitter to %.3f MHz and receiver to %.3f MHz.\n", kanal[i], chan_type_long_name(chan_type[i]), amps_channel2freq(kanal[i], 0) / 1e6, amps_channel2freq(kanal[i], 1) / 1e6);
+			printf("Base station on channel %d ready (%s), please tune transmitter to %.3f MHz and receiver to %.3f MHz. (%.3f MHz offset)\n", kanal[i], chan_type_long_name(chan_type[i]), amps_channel2freq(kanal[i], 0) / 1e6, amps_channel2freq(kanal[i], 1) / 1e6, amps_channel2freq(kanal[i], 2) / 1e6);
 		else
-			printf("Base station on channel %d ready (%s), please tune transmitter to %.4f MHz and receiver to %.4f MHz.\n", kanal[i], chan_type_long_name(chan_type[i]), amps_channel2freq(kanal[i], 0) / 1e6, amps_channel2freq(kanal[i], 1) / 1e6);
+			printf("Base station on channel %d ready (%s), please tune transmitter to %.4f MHz and receiver to %.4f MHz. (%.3f MHz offset)\n", kanal[i], chan_type_long_name(chan_type[i]), amps_channel2freq(kanal[i], 0) / 1e6, amps_channel2freq(kanal[i], 1) / 1e6, amps_channel2freq(kanal[i], 2) / 1e6);
 	}
 
 	main_mobile(&quit, latency, interval, NULL, station_id, 10);

src/anetz/anetz.c

@@ -91,6 +91,9 @@ double anetz_kanal2freq(int kanal, int unterband)
 {
 	double freq = 162.050;
 
+	if (unterband == 2)
+		return -4.500 * 1e6;
+
 	freq += (kanal - 30) * 0.050;
 	if (kanal >= 45)
 		freq += 6.800;

src/anetz/main.c

@@ -184,7 +184,7 @@ int main(int argc, char *argv[])
 			fprintf(stderr, "Failed to create \"Sender\" instance. Quitting!\n");
 			goto fail;
 		}
-		printf("Base station on channel %d ready, please tune transmitter to %.3f MHz and receiver to %.3f MHz.\n", kanal[i], anetz_kanal2freq(kanal[i], 0) / 1e6, anetz_kanal2freq(kanal[i], 1) / 1e6);
+		printf("Base station on channel %d ready, please tune transmitter to %.3f MHz and receiver to %.3f MHz. (%.3f MHz offset)\n", kanal[i], anetz_kanal2freq(kanal[i], 0) / 1e6, anetz_kanal2freq(kanal[i], 1) / 1e6, anetz_kanal2freq(kanal[i], 2) / 1e6);
 	}
 
 	main_mobile(&quit, latency, interval, NULL, station_id, 5);

src/bnetz/bnetz.c

@@ -118,6 +118,9 @@ double bnetz_kanal2freq(int kanal, int unterband)
 {
 	double freq = 153.010;
 
+	if (unterband == 2)
+		return -4.600 * 1e6;
+
 	if (kanal >= 50)
 		freq += 9.200 - 0.020 * 49;
 	freq += (kanal - 1) * 0.020;

src/bnetz/main.c

@@ -199,7 +199,7 @@ int main(int argc, char *argv[])
 			fprintf(stderr, "Failed to create \"Sender\" instance. Quitting!\n");
 			goto fail;
 		}
-		printf("Base station for channel %d ready, please tune transmitter to %.3f MHz and receiver " "to %.3f MHz.\n", kanal[i], bnetz_kanal2freq(kanal[i], 0) / 1e6, bnetz_kanal2freq(kanal[i], 1) / 1e6);
+		printf("Base station for channel %d ready, please tune transmitter to %.3f MHz and receiver " "to %.3f MHz. (%.3f MHz offset)\n", kanal[i], bnetz_kanal2freq(kanal[i], 0) / 1e6, bnetz_kanal2freq(kanal[i], 1) / 1e6, bnetz_kanal2freq(kanal[i], 2) / 1e6);
 		printf("To call phone, switch transmitter (using paging signal) to %.3f MHz.\n", bnetz_kanal2freq(19, 0) / 1e6);
 	}
 

src/cnetz/cnetz.c

@@ -168,12 +168,15 @@ double cnetz_kanal2freq(int kanal, int unterband)
 {
 	double freq = 465.750;
 
+	if (unterband == 2)
+		return -10.000 * 1e6;
+
 	if ((kanal & 1))
 		freq -= (double)(kanal + 1) / 2.0 * 0.010;
 	else
 		freq -= (double)kanal / 2.0 * 0.0125;
 	if (unterband)
-		freq -= 10.0;
+		freq -= 10.000;
 
 	return freq * 1e6;
 }

src/cnetz/main.c

@@ -566,9 +566,9 @@ int main(int argc, char *argv[])
 			goto fail;
 		}
 		if ((kanal[i] & 1)) {
-			printf("Base station on channel %d ready, please tune transmitter to %.3f MHz and receiver to %.3f MHz.\n", kanal[i], cnetz_kanal2freq(kanal[i], 0) / 1e6, cnetz_kanal2freq(kanal[i], 1) / 1e6);
+			printf("Base station on channel %d ready, please tune transmitter to %.3f MHz and receiver to %.3f MHz. (%.3f MHz offset)\n", kanal[i], cnetz_kanal2freq(kanal[i], 0) / 1e6, cnetz_kanal2freq(kanal[i], 1) / 1e6, cnetz_kanal2freq(kanal[i], 2) / 1e6);
 		} else {
-			printf("Base station on channel %d ready, please tune transmitter to %.4f MHz and receiver to %.4f MHz.\n", kanal[i], cnetz_kanal2freq(kanal[i], 0) / 1e6, cnetz_kanal2freq(kanal[i], 1) / 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], cnetz_kanal2freq(kanal[i], 0) / 1e6, cnetz_kanal2freq(kanal[i], 1) / 1e6, cnetz_kanal2freq(kanal[i], 2) / 1e6);
 		}
 	}
 

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;

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);

src/r2000/main.c

@@ -381,7 +381,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], r2000_channel2freq(band, kanal[i], 0) / 1e6, r2000_channel2freq(band, kanal[i], 1) / 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], r2000_channel2freq(band, kanal[i], 0) / 1e6, r2000_channel2freq(band, kanal[i], 1) / 1e6, r2000_channel2freq(band, kanal[i], 2) / 1e6);
 		nconv = (nconv + 1) & 7;
 	}
 

src/r2000/r2000.c

@@ -114,6 +114,9 @@ double r2000_channel2freq(int band, int channel, int uplink)
 		return 0.0;
 	}
 
+	if (uplink == 2)
+		return -r2000_bands[i].duplex * 1e6;
+
 	freq = r2000_bands[i].dl_f0 + CHANNEL_SPACING * (double)(channel);
 	if (uplink)
 		freq -= r2000_bands[i].duplex;