Changed command line options

* All lower case options define common options
* All upper case options define network specific options

docs/a-netz.html

@@ -201,7 +201,7 @@ Tune the transmitter to 162.050 MHz and the receiver to 157.550 MHz.
 You should tune the receiver to 164.050 MHz first, to check if you hear the idle signal from the base station.
 Then tune to actually up-link frequency 157.550 MHz.
 The actual level is not yet relevant.
-(You may check the quality using '-L 2' command line option and build a radio loop by tuning the receiver to the transmitter.)
+(You may check the quality using '-l 2' or '--loopback' command line option and build a radio loop by tuning the receiver to the transmitter.)
 </p>
 
 <pre>
@@ -254,7 +254,7 @@ Be sure that the phone turns off the transmitter and indicates the (green) light
 <p>
 Level adjustment:
 We see a receive level of around 140%.
-Then start the base station using '-L 2' option for loop-back and tune receiver to the transmitter.
+Then start the base station using '-l 2' option for loop-back and tune receiver to the transmitter.
 The base station generates a 1750 Hz test signal, just like the mobile phone.
 Use the variable resistor (connecting your transmitter) to adjust the volume until the received level matches the same level of your previously received signal.
 In my case I adjust the transmitter to match around 140%. (+- 10% is good)

docs/amps.html

@@ -86,7 +86,7 @@ Setup of a base station
 
 <pre>
 
-# amps -k 334 -F yes -E -e
+# amps -k 334 -F yes -p -d
 ...
 Selected System ID (SID) 40 belongs to:
         Salinas, CA (GTE Mobile)
@@ -110,7 +110,7 @@ frame.c:3658 info   : RX Level: 52% Quality: 60% Polarity: NEGATIVE
 You should tune the receiver to 880.020 first, to check if you can hear and decode the idle signal from the base station.
 Then tune to actually uplink frequency 835.020 MHz.
 The actual level is not yet relevant.
-(You may check the quality using '-L 2' command line option and build a radio loop by tuning the receiver to the transmitter.)
+(You may check the quality using '-l 2' or '--loopback 2' command line option and build a radio loop by tuning the receiver to the transmitter.)
 </p>
 
 <pre>

docs/b-netz.html

@@ -121,6 +121,7 @@ All digit starts with sync pattern ("0 1 1 1 0").
 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 |0 1 1 1 0|0 1 0 0 0|1|0 0 0 1 0| Funkwahl ohne Gebührenübermittlung
 |0 1 1 1 0|0 0 1 0 0|1|0 0 1 0 0| Funkwahl mit Gebührenübermittlung
+|0 1 1 1 0|0 0 0 1 0|1|0 1 0 0 0| Funkwahl mit Gebührenübermittlung (Payphone)
 |0 1 1 1 0|1 0 0 0 0|1|0 0 0 0 1| Funkwahlende
 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
@@ -514,7 +515,7 @@ But you get a busy signal, that means there is no channel.
 
 <p>
 Now run your base station on channel 1.
-You may add '-g x' or '--gfs x' command line option to change the station ID from default to any value you like. (see help)
+You may add '-G x' or '--gfs x' command line option to change the station ID from default to any value you like. (see help)
 If you have a phone that supports GFS 19, please use this GFS 19 to reduce the transmit power of the phone to 100 mW instead of 15 Watts.
 To see if your phone supports it, try to preselect GFS 19.
 Tune the transmitter to 153.010 MHz and the receiver to 148.410 MHz.
@@ -698,7 +699,7 @@ Detecting loss of carrier signal:
 We do not have any RSSI (Received Signal Strength Indicator) signal from our radio, so we cannot directly find out if the signal is lost.
 But we have a constant noise level when the signal is lost.
 Be sure to have squelch on your receiver all the way open, so that noise reaches the base station.
-In order to see this level, use command line option '-0 100 -D 0' or '--loss 100 --debug 0'.
+In order to see this level, use command line option '-L 100 -v 0' or '--loss 100 --verbose 0'.
 The noise level (relative to the sound card's input level) is shown:
 </p>
 
@@ -710,8 +711,8 @@ loss.c:74 debug  : Noise level = 22%
 
 <p>
 Since we have a noise level of about 20%, we can use a threshold of 10%.
-Use command line option '-0 10' in this case.
-To see the process, keep debugging on by using command line option '-D 0'.
+Use command line option '-L 10' in this case.
+To see the process, keep debugging on by using command line option '-v 0'.
 Whenever the noise level is above the given percentage, loss of carrier is assumed, if the noise level is constant.
 If the noise level changes (due to speech), the noise is ignored and the loss counter is reset.
 After a system specific duration of signal loss, the call is released.

docs/c-netz.html

@@ -384,7 +384,7 @@ To run the base station I the following command line options:
 
 <pre>
 
-# cnetz -k 131 -E -e -S 19.25,19.25
+# cnetz -k 131 -p -d -S 19.25,19.25
 ...
 cnetz.c:142 notice : You selected channel 131 ('Orga-Kanal') for combined callin
 g + traffic channel. Some phones will reject this.
@@ -409,7 +409,7 @@ After the call has been terminated, the control channel is restored and the othe
 You should tune the receiver to 465.090 first, to check if you can hear and decode the idle signal from the base station.
 Then tune to actually up-link frequency 455.090 MHz.
 The actual level is not yet relevant.
-(You may check the quality using '-L 2' command line option and build a radio loop by tuning the receiver to the transmitter.)
+(You may check the quality using '-l 2' or '--loopback 2' command line option and build a radio loop by tuning the receiver to the transmitter.)
 </p>
 
 <p>

docs/headset.html

@@ -64,7 +64,7 @@ To calibrate input level (microphone), run the B-Netz base station with loop-bac
 
 <pre>
 
-# src/bnetz/bnetz -k 1 -L 3 -c hw:2,0
+# src/bnetz/bnetz -k 1 -l 3 -c hw:2,0
 bnetz.c:268 info   : Entering IDLE state, sending 'Gruppenfreisignal' 2 on channel 1.
 Base station ready, please tune transmitter to 153.010 MHz and receiver to 148.410 MHz.
 To call phone, switch transmitter using pilot tone to 153.370 MHz

docs/index.html

@@ -73,7 +73,7 @@ Implemented networks:
 <center>
 <ul>
 	<li><a href="a-netz.html">A-Netz</a> (Germany)</li>
-	<li><a href="b-netz.html">B-Netz</a> (Germany)</li>
+	<li><a href="b-netz.html">B-Netz</a> (Germany) ATF-1 (Netherlands)</li>
 	<li><a href="c-netz.html">C-Netz</a> (Germany)</li>
 	<li><a href="nmt.html">NMT - Nordic Mobile Telephone</a> (Scandinavia)</li>
 	<li><a href="amps.html">AMPS - Advanced Mobile Phone Service</a> (USA)</li>

docs/install.html

@@ -51,7 +51,7 @@ Now you are ready for a quick test:
 
 <pre>
 
-# src/bnetz/bnetz -k 1 -L 2
+# src/bnetz/bnetz -k 1 -l 2
 bnetz.c:268 info   : Entering IDLE state, sending 'Gruppenfreisignal' 2 on channel 1.
 Base station ready, please tune transmitter to 153.010 MHz and receiver to 148.410 MHz.
 To call phone, switch transmitter using pilot tone to 153.370 MHz

docs/nmt.html

@@ -546,7 +546,7 @@ Check out what networks are available:
 
 <pre>
 
-# nmt -y list
+# nmt -Y list
 TA      Short   Country (Provider)
 ------------------------------------------------------------------------
 5       DK      Denmark (Tele Danmark Mobile)
@@ -563,7 +563,7 @@ TA      Short   Country (Provider)
 <p>
 In this example we select 'Sweden'.
 You must set you phone to network 'Sweden' or 'SE'.
-Then use the command line parameter '-y SE,1' or '--traffic-area SE,1' to select cell area 1 in Sweden.
+Then use the command line parameter '-Y SE,1' or '--traffic-area SE,1' to select cell area 1 in Sweden.
 In this example we set the two digits 'traffic area' to 61.
 If the phone was not in this area recently, it will send roaming update, as soon as it finds our network.
 </p>
@@ -583,7 +583,7 @@ Use a traffic are of 'SE,2', so the phone registers, if it was previously regist
 
 <pre>
 
-nmt -k 1 -y SE,2
+nmt -k 1 -Y SE,2
 nmt.c:278 info   : Selecting country code 6 of SE,Sweden (provider 'Telia Mobitel')
 ...
 nmt.c:402 info   : Entering IDLE state, sending idle frames on combined calling &amp; traffic channel.

docs/software.html

@@ -55,12 +55,12 @@ To call phone, switch transmitter (using pilot signal) to 153.370 MHz.
 
 <p>
 Alternatively select a different sound adapter.
-If you prefer card 2, device 0, add '-d hw:2,0' or '--device hw:2,0' to the command line:
+If you prefer card 2, device 0, add '-a hw:2,0' or '--audio-device hw:2,0' to the command line:
 </p>
 
 <pre>
 
-# src/bnetz/bnetz -k 1 -d hw:2,0
+# src/bnetz/bnetz -k 1 -a hw:2,0
 
 </pre>
 
@@ -83,13 +83,13 @@ Do not use input gain on the microphone.
 
 <p>
 Now we want to calibrate transmitter and receiver audio level.
-Run the B-Netz base station in loopback test mode (-L 2).
+Run the B-Netz base station in loopback test mode (-l 2).
 Even if you plan to setup A-Netz base station, use B-Netz base station for calibration.
 </p>
 
 <pre>
 
-# src/bnetz/bnetz -k 1 -L 2
+# src/bnetz/bnetz -k 1 -l 2
 bnetz.c:268 info   : Entering IDLE state, sending 'Gruppenfreisignal' 2 on channel 1.
 Base station ready, please tune transmitter to 153.010 MHz and receiver to 148.410 MHz.
 To call phone, switch transmitter (using pilot signal) to 153.370 MHz.
@@ -155,7 +155,7 @@ Use the command line option '-x' or '--cross':
 
 <pre>
 
-# src/bnetz/bnetz -k 1 -x -L 2
+# src/bnetz/bnetz -k 1 -x -l 2
 bnetz.c:268 info   : Entering IDLE state, sending 'Gruppenfreisignal' 2 on channel 1.
 Base station ready, please tune transmitter to 153.010 MHz and receiver to 148.410 MHz.
 To call phone, switch transmitter (using pilot signal) to 153.370 MHz.
@@ -186,7 +186,7 @@ A frequency of 2000 Hz is lowered down to half of it's amplitude (-6 db), so it
 <p>
 Generally a transmitter is doing pre-emphasis for you.
 If you are connected directly to the PLL of your transmitter, you will also not have pre-emphasis.
-In this case you need to do it inside the base station software. Use the command line option '-E' or '--pre-emphasis':
+In this case you need to do it inside the base station software. Use the command line option '-p' or '--pre-emphasis':
 </p>
 
 <pre>
@@ -198,7 +198,7 @@ In this case you need to do it inside the base station software. Use the command
 <p>
 The receiver is doing the de-emphasis for you.
 If you are connected directly to the discriminator of your receiver, you will also not have de-emphasis.
-In this case you need to do it inside the base station software. Use the command line option '-e' or '--de-emphasis':
+In this case you need to do it inside the base station software. Use the command line option '-d' or '--de-emphasis':
 </p>
 
 <pre>
@@ -216,13 +216,13 @@ Especially if you use discriminator output, you might have low output voltage.
 In my experiments it helps to amplify the amplitude by factor two in order adjust a received signal to 100%.
 A gain of 6 dB will amplify the amplitude by factor two.
 Also the noise of the sound adapter will be amplified by factor two, but this is not relevant at 16 bit resolution.
-Use the command line option '-G 6' or '--rx-gain 6'.
+Use the command line option '-g 6' or '--rx-gain 6'.
 In this example I use both, transmitter and receiver without emphasis (so software must do it) and add extra 6 dB gain to the input from the receiver:
 </p>
 
 <pre>
 
-# src/bnetz/bnetz -k 1 -E -e -G 6
+# src/bnetz/bnetz -k 1 -p -d -g 6
 
 </pre>
 
@@ -235,7 +235,7 @@ As used before, the loop-back test can be used to verify the signal process, suc
 </p>
 
 <p>
-If command line option '-L 1' or '--loopback 1' is given, a loop-back inside the software is performed.
+If command line option '-l 1' or '--loopback 1' is given, a loop-back inside the software is performed.
 Also the audio signal is sent to the audio adapter, but not received from it.
 This test is used to debug the software.
 It can be used to see what the output of an external loop would look like.
@@ -243,7 +243,7 @@ It can be used to see what the output of an external loop would look like.
 
 <pre>
 
-./bnetz/bnetz -k 1 -L 1
+./bnetz/bnetz -k 1 -l 1
 bnetz.c:351 info   : Entering IDLE state, sending 'Gruppenfreisignal' 2.
 Base station for channel 1 ready, please tune transmitter to 153.010 MHz and receiver to 148.410 MHz.
 To call phone, switch transmitter (using pilot signal) to 153.370 MHz.
@@ -266,13 +266,13 @@ bnetz.c:528 notice : Round trip delay is 0.001 seconds
 </pre>
 
 <p>
-If command line option '-L 2' or '--loopback 2' is given, an external loop-back is performed.
+If command line option '-l 2' or '--loopback 2' is given, an external loop-back is performed.
 The receiver needs to be tuned to transmitter, so the software receives its own signal.
 The received quality level is relevant. It should be not less than 90 for B-Netz.
 </p>
 
 <p>
-If command line option '-L 3' or '--loopback 3' is given, the audio from the input is sent back to the output.
+If command line option '-l 3' or '--loopback 3' is given, the audio from the input is sent back to the output.
 It can be used to check a headset.
 Everything that is spoken into the microphone should appear on the headphone.
 </p>