Skip to content

Commit

Permalink
Update help messages (catalinii#926)
Browse files Browse the repository at this point in the history
* Update help messages

Fixes some help messages, and improves the automatically generated readme of the project

* missing modifier in option

* fix initial header tabulation
  • Loading branch information
lars18th committed Jan 28, 2022
1 parent fa0c5bc commit 4df900f
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions readme_footer
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ make EXTRA_CFLAGS=....
Examples:
-------
- In order to listen to a radio after minisatip is started open the following URL in your favorite media player:
- on Hotbird 13E: "http://MINISATIP_HOST:8080/?msys=dvbs&freq=11623&pol=v&sr=27500&pids=0,10750,254"
- Astra 19.2E: "http://MINISATIP_HOST:8080/?msys=dvbs&freq=12266&pol=h&sr=27500&pids=0,851"
- on Hotbird 13E: `http://MINISATIP_HOST:8080/?msys=dvbs&freq=11623&pol=v&sr=27500&pids=0,10750,254`
- Astra 19.2E: `http://MINISATIP_HOST:8080/?msys=dvbs&freq=12266&pol=h&sr=27500&pids=0,851`

- Television FTA programs:
- Astra 19.2E, Kika HD: "rtsp://MINISATIP_HOST:554/?src=1&freq=11347&pol=v&ro=0.35&msys=dvbs2&mtype=8psk&plts=on&sr=22000&fec=23&pids=0,17,18,6600,6610,6620,6630"
- Astra 19.2E, Kika HD: `http://MINISATIP_HOST:554/?src=1&freq=11347&pol=v&ro=0.35&msys=dvbs2&mtype=8psk&plts=on&sr=22000&fec=23&pids=0,17,18,6600,6610,6620,6630`

- msys can be one of: dvbs, dvbs2, dvbt, dvbt2, dvbc, dvbc2, atsc, isdbt, dvbcb ( - DVBC_ANNEX_B )

2 changes: 1 addition & 1 deletion readme_header
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ https://paypal.me/minisatip

Usage:
-------

(Message automatically generated from "minisatip --help")
32 changes: 16 additions & 16 deletions src/minisatip.c
Original file line number Diff line number Diff line change
Expand Up @@ -287,15 +287,15 @@ void usage() {

printf(
"\n\t./%s [-[fgtzE]] [-a x:y:z] [-b X:Y] [-B X] [-H X:Y] [-d A:C-U ] [-D device_id] [-e X-Y,Z] [-i prio] \n\
\t[-[uj] A1:S1-F1[-PIN]] [-m mac] [-P port] [-l module1[,module2]] [-v module1[,module2]]"
\t[-[uj] A1:S1-F1[-PIN]] [-m mac] [-P port] [-l module1[,module2]] [-v module1[,module2]] \n\t"
#ifndef DISABLE_DVBAPI
"[-o oscam_host:dvbapi_port,offset] "
"[-o [~]oscam_host:dvbapi_port[,offset] "
#endif
"[-p public_host] [-r remote_rtp_host] [-R document_root] "
#ifndef DISABLE_SATIPCLIENT
"[-s [*][DELSYS:][FE_ID@][source_ip/]host[:port] "
#endif
"[-u A1:S1-F1[-PIN]] [-L A1:low-high-switch] [-w "
"\n\t[-u A1:S1-F1[-PIN]] [-L A1:low-high-switch] [-w "
"http_server[:port]] \n "
#ifdef AXE
"[-7 M1:S1[,M2:S2]] [-A SRC1:INP1:DISEQC1[,SRC2:INP2:DISEQC2]]\n\n"
Expand Down Expand Up @@ -434,17 +434,17 @@ Help\n\
#ifndef DISABLE_SATIPCLIENT
"\
* -s --satip-servers [~][*][DELSYS:][FE_ID@][source_ip/]host[:port] - specify the remote satip host and port with delivery system DELSYS, it is possible to use multiple -s \n\
* ~ When using this symbol at start the `pids=all` call is replaced with `pids=0-20`\n\
* - Use TCP if -O is not specified and UDP if -O is specified\n\
DELSYS - can be one of: dvbs, dvbs2, dvbt, dvbt2, dvbc, dvbc2, isdbt, atsc, dvbcb ( - DVBC_ANNEX_B ) [default: dvbs2]\n\
host - the server of the satip server\n\
port - rtsp port for the satip server [default: 554]\n\
FE_ID - will be determined automatically\n\
eg: -s 192.168.1.2 -s dvbt:192.168.1.3:554 -s dvbc:192.168.1.4\n\
* [~] When using this symbol at start the `pids=all` call is replaced with `pids=0-20`\n\
* [*] Use TCP if -O is not specified and UDP if -O is specified\n\
* DELSYS - can be one of: dvbs, dvbs2, dvbt, dvbt2, dvbc, dvbc2, isdbt, atsc, dvbcb ( - DVBC_ANNEX_B ) [default: dvbs2]\n\
* host - the server of the satip server\n\
* port - rtsp port for the satip server [default: 554]\n\
* FE_ID - will be determined automatically\n\
* eg: -s 192.168.1.2 -s dvbt:192.168.1.3:554 -s dvbc:192.168.1.4\n\
- specifies 1 dvbs2 (and dvbs)satip server with address 192.168.1.2:554\n\
- specifies 1 dvbt satip server with address 192.168.1.3:554\n\
- specifies 1 dvbc satip server with address 192.168.1.4:554\n\
eg: -s dvbt:[email protected]/192.168.1.2:555\n\
* eg: -s dvbt:[email protected]/192.168.1.2:555\n\
- specifies 1 dvbt adapter to satip server with address 192.168.1.2, port 555. The client will use fe=2 (indicating adapter 2 on the server) and will connect from IP address 192.168.1.100\n\
address 192.168.1.100 needs to be assigned to an interface on the server running minisatip.\n\
This feature is useful for AVM FRITZ!WLAN Repeater\n\
Expand All @@ -455,7 +455,7 @@ Help\n\
* -O --satip-tcp Use RTSP over TCP instead of UDP for data transport \n\
"
#endif
" \
"\
* -S --slave ADAPTER1,ADAPTER2-ADAPTER4[,..]:MASTER - specify slave adapters \n\
* Allows specifying bonded adapters (multiple adapters connected with a splitter to the same LNB)\n\
* This feature is used by FBC receivers and AXE to specify the source input of the adapter\n\
Expand All @@ -481,10 +481,10 @@ Help\n\
* -j --jess jess_string - same format as -u \n\
\n\
* -U --sources sources_for_adapters: limit the adapters to specific sources/positions\n\
* eg: -U 0-2:*:3:2,6,8 (no spaces between parameters)\n\
- In this example: for SRC=1 only 0,1,2; for SRC=2 all: for SRC=3 only 3; and for SRC=4 the 2,6,8 adapters are used.\n\
- For each position (separated by : ) you need to declare all the adapters that use this position with no exception.\n\
- The special char * indicates all adapters for this position.\n\
* eg: -U 0-2:*:~:2,6,8 (no spaces between parameters)\n\
- In this example: for SRC=1 only 0,1,2; for SRC=2 all: for SRC=3 none; and for SRC=4 the 2,6,8 adapters are used.\n\
- For each position (separated by : ) you need to declare all the adapters (or none) that use this position with no exception.\n\
- The special char * indicates all adapters for this position. The char ~ indicates none.\n\
- The number of sources range from 1 to 64; but the list can include less than 64 (in this case all are enabled for undefined sources).\n\
- By default or in case of errors all adapters have enabled all positions.\n\
\n\
Expand Down

0 comments on commit 4df900f

Please sign in to comment.