diff --git a/src/doc/man/svxlink.conf.5 b/src/doc/man/svxlink.conf.5 index 13a2cdd4..f2391e2b 100644 --- a/src/doc/man/svxlink.conf.5 +++ b/src/doc/man/svxlink.conf.5 @@ -31,7 +31,7 @@ file might look like is shown below. VALUE2="TWO " VAULE3="Multi " "line" - + [SECTION2] VALUE1=2 @@ -140,7 +140,7 @@ positioning data to location servers. Setting this item makes the system visible on the EchoLink link status page and the APRS network. .TP .B LINKS -Enter here a comma separated list of section names that contains the +Enter here a comma separated list of section names that contains the configuration information for linking logics together (see Logic Linking). . .SS Common Logic configuration variables @@ -244,13 +244,13 @@ identification is to just announce that the station is on the air. Typically jus callsign is transmitted. For a repeater a good value is ten minutes and for a simplex node one time every 60 minutes is probably enough. The LONG_IDENT_INTERVAL must be an even multiple of the SHORT_IDENT_INTERVAL so if LONG_IDENT_INTERVAL is 60 then the -legal values for SHORT_IDENT_INTERVAL are: 1, 2, 3, 4, 5, 6, 10, 12, 15, 20, 30, 60. +legal values for SHORT_IDENT_INTERVAL are: 1, 2, 3, 4, 5, 6, 10, 12, 15, 20, 30, 60. If unset or set to 0, disable short identifications. .TP .B LONG_IDENT_INTERVAL The number of minutes between long identifications. The purpose of the long identification is to transmit some more information about the station status (new voice mails etc). The time of -day is also transmitted. A good value here is 60 minutes. +day is also transmitted. A good value here is 60 minutes. If unset or set to 0, disable long identifications. .TP .B IDENT_ONLY_AFTER_TX @@ -261,7 +261,7 @@ using an RF link to provide echolink to a repeater. Often, in this situation, it desirable for the link to identify unless legally necessary. Note that SHORT_IDENT_INTERVAL still have to be set for this feature to work. That config variable will then be interpreted as the minimum number of seconds between identifications. The -LONG_IDENT_INTERVAL will not be affected by this parameter. +LONG_IDENT_INTERVAL will not be affected by this parameter. .TP .B EXEC_CMD_ON_SQL_CLOSE Specify a time, in milliseconds, after squelch close after which entered DTMF @@ -283,12 +283,12 @@ The number of milliseconds to wait after the squelch has been closed before a ro is played. The beep can be disabled by specifying a value of \-1 or commenting out this line. Often it is best to use the SQL_HANGTIME receiver configuration variable to specify a delay instead of specifying a delay here. This configuration variable should then be set -to 0. +to 0. .TP .B REPORT_CTCSS If set, will report the specified CTCSS frequency upon manual identification (* pressed). It is possible to specify fractions using "." as decimal comma. Disable this feature by -commenting out (#) this configuration variable. +commenting out (#) this configuration variable. .TP .B TX_CTCSS This configuration variable controls if a CTCSS tone should be transmitted. @@ -483,33 +483,33 @@ SvxLink (e.g. filtering, DTMF muting, squelch tail elimination) and the ability to use remote receivers. .TP .B IDLE_TIMEOUT -The number of seconds the repeater should have been idle before turning the +The number of seconds the repeater should have been idle before turning the transmitter off. .TP .B OPEN_ON_1750 Use this configuration variable if it should be possible to open the repeater with a -1750Hz tone burst. Specify the number of milliseconds the tone must be asserted -before the repeater is opened. Make sure that the time specified is long enough for +1750Hz tone burst. Specify the number of milliseconds the tone must be asserted +before the repeater is opened. Make sure that the time specified is long enough for the squelch to have time to open. Otherwise the repeater will open "too soon" and you will hear an ugly 1750Hz beep as the first thing. A value of 0 will disable 1750 Hz repeater opening. .TP .B OPEN_ON_CTCSS -Use this configuration variable if it should be possible to open the repeater with -a CTCSS tone (PL). The syntax of the value is tone_fq:min_length. The tone -frequency is specified in whole Hz and the minimum tone length is specified in -milliseconds. For examples if a 136.5 Hz tone must be asserted for two seconds for +Use this configuration variable if it should be possible to open the repeater with +a CTCSS tone (PL). The syntax of the value is tone_fq:min_length. The tone +frequency is specified in whole Hz and the minimum tone length is specified in +milliseconds. For examples if a 136.5 Hz tone must be asserted for two seconds for the repeater to open, the value 136:2000 should be specified. .TP .B OPEN_ON_DTMF -Use this configuration variable if it should be possible to open the repeater with -a DTMF digit. Only one digit can be specified. DTMF digits pressed when the repeater +Use this configuration variable if it should be possible to open the repeater with +a DTMF digit. Only one digit can be specified. DTMF digits pressed when the repeater is down will be ignored. .TP .B OPEN_ON_SEL5 -Use this configuration variable if you want to open your repeater by using a -selective tone call that is often used in commercial radio networks. -Example: OPEN_ON_SEL5=03345 opens your repeater only if that sequence has been +Use this configuration variable if you want to open your repeater by using a +selective tone call that is often used in commercial radio networks. +Example: OPEN_ON_SEL5=03345 opens your repeater only if that sequence has been received. You can use sequence lengths from 4 to 25. .TP .B CLOSE_ON_SEL5 @@ -1006,16 +1006,16 @@ For example, pressing DTMF sequence "D1#" will activate the EchoLink module and connect to the EchoTest conference node. . .SS Logic Linking -A logic linking configuration section is used to specify information for a link -between two or more SvxLink logic cores. Such a link can for example be used to +A logic linking configuration section is used to specify information for a link +between two or more SvxLink logic cores. Such a link can for example be used to connect a local repeater to a remote repeater using a separate link transceiver. -The link is activated/deactivated using DTMF commands and/or automatically +The link is activated/deactivated using DTMF commands and/or automatically depending on your configuration. When the link is active, all audio received by one logic will be transmitted by the other logic(s). .P -The name of the logic linking section can be chosen freely. In the example -configuration file, there is a section [LinkToR4]. To use a logic linking -section in a logic core it must be pointed out by the LINKS configuration +The name of the logic linking section can be chosen freely. In the example +configuration file, there is a section [LinkToR4]. To use a logic linking +section in a logic core it must be pointed out by the LINKS configuration variable in the GLOBAL section. Example: GLOBAL/LINKS=LinkToR4 .TP @@ -1179,7 +1179,7 @@ the transceiver makes a noise when the transmitter is turned off, that might trigger the VOX and cause an infinite loop of squelch open/close transmitter on/off. Specify the number of milliseconds that the squelch should be "deaf" after -the transmitter has been turned off. +the transmitter has been turned off. .TP .B SQL_DELAY Specify a delay in milliseconds that a squelch open indication will be delayed. @@ -1223,12 +1223,12 @@ the system indefinitely. .B VOX_FILTER_DEPTH The number of milliseconds to create the mean value over. A small value will make the vox react quicker (<200) and larger values will make it a little bit more sluggish. A small -value is often better. +value is often better. .TP .B VOX_THRESH The threshold that the mean value of the samples must exceed for the squelch to be considered open. It's hard to say what is a good value. Something around 1000 is probably -a good value. Set it as low as possible without getting the vox to false trigger. +a good value. Set it as low as possible without getting the vox to false trigger. .TP .B CTCSS_MODE This configuration variable set the CTCSS detection method used. These are the @@ -1355,7 +1355,7 @@ If SQL_DET is set to SERIAL, this config variable determines which serial port s used for hardware squelch input (COS - Carrier Operated Squelch). Note: If the same serial port is used for the PTT, make sure you specify exactly the same device name. Otherwise the RX and TX will not be able to share the port. -Example: SQL_PORT=/dev/ttyS0 +Example: SQL_PORT=/dev/ttyS0 .TP .B SERIAL_PIN If SQL_DET is set to SERIAL, this config variable determines which pin in the @@ -1510,7 +1510,7 @@ frequency spectrum (5.5 - 6.4kHz, 100Hz step) to indicate one of ten signal levels. Only the receiving part have been implemented in SvxLink at the moment. On the remote receiver side an Atmel AVR ATmega8 is used to map the signal level voltage to tone frequencies. -Use the TONE_SIGLEV_MAP configuration variable to map each tone to a +Use the TONE_SIGLEV_MAP configuration variable to map each tone to a corresponding signal level value in between 0 - 100. Type AFSK is like the TONE detector really a transport mechanism. Signal level @@ -1530,7 +1530,7 @@ used to determine priority in comparison to other receivers and audio sources. Use the SIGLEV_CONST configuration variable to set the signal level. .TP .B HID_DEVICE -This parameter defines the device your hidraw adapter is connected to. This +This parameter defines the device your hidraw adapter is connected to. This port is created by the linux/hidraw driver. e.g. HID_DEVICE=/dev/hidraw3 .TP @@ -1573,7 +1573,7 @@ The Atmel AVR processor used by the author have a reverse mapping so that the first tone (5500Hz) indicate the highest signal strength and the last tone (6400Hz) indicate the lowest signal strength. It is also not linear since it's more important to have fine measurement granularity in the lower -signal strength range. This is how the mapping look for the AVR: +signal strength range. This is how the mapping look for the AVR: 100,84,60,50,37,32,28,23,19,8. .TP .B SQL_SIGLEV_OPEN_THRESH @@ -1768,7 +1768,7 @@ variable to at least 75 milliseconds. Legal values for 1750_MUTING are 0=disabled, 1=enabled. .TP .B SEL5_TYPE -Define here your selective tone call system. You have the choice of the +Define here your selective tone call system. You have the choice of the following types: ZVEI1, ZVEI2, ZVEI3, PZVEI, PDZVEI, DZVEI, CCITT, EEA, CCIR1, CCIR2, NATEL, EURO, VDEW, AUTO-A, MODAT, PCCIR and EIA. Only one system can be used at the same time. Please take into consideration that some Sel5 standards @@ -2341,7 +2341,7 @@ Define the device node where your hidraw device is accessible at. Example: HID_DEVICE=/dev/hidraw3 .TP .B HID_PTT_PIN -Define the pin your ptt control is connected to. Valid parameters are +Define the pin your ptt control is connected to. Valid parameters are are GPIO1,GPIO2,GPIO3,GPIO4. Note that some sound cards like SSS1621 may not support GPIO3 and GPIO4! You can invert the behavior with a "!" in front of the name. Only one value is supported. @@ -2372,7 +2372,7 @@ This is a feature that will prevent the transmitter from getting stuck transmitt Specify the number of seconds before the transmitter is turned off. Note that this is a low level security mechanism that is meant to only kick in if there is a software bug in SvxLink. Just so that the transmitter will not transmit indefinitely. It is not meant to -be used to keep people from talking too long. +be used to keep people from talking too long. .TP .B TX_DELAY The number of milliseconds (0-1000) to wait after the transmitter has been turned on until @@ -2660,16 +2660,16 @@ configuration variables are listed below. .TP .B NAME The name of the module. This name must match the namespace used in the TCL event handling -script. If not set, NAME will be set to the section name. +script. If not set, NAME will be set to the section name. .TP .B PLUGIN_NAME The base name of the plugin. For example if this configuration variable is set to Foo, the core will look for a plugin called ModuleFoo.so. If not set, PLUGIN_NAME will be set to -the same value as NAME. +the same value as NAME. .TP .B ID Specify the module identification number. This is the number used to access the module -from the radio interface. +from the radio interface. .TP .B TIMEOUT Specify the timeout time, in seconds, after which a module will be automatically @@ -2735,7 +2735,7 @@ Example: LAT_POSITION=51.02.22N .TP .B CALLSIGN -Enter your callsign for the APRS network with a prefix that indicates the type +Enter your callsign for the APRS network with a prefix that indicates the type of station, (ER- for repeaters, EL- for links). Examples: @@ -2923,7 +2923,7 @@ Open the squelch so that there is only noise coming into SvxLink. Use a second transceiver to make a short, unmodulated transmission. Release the PTT when the "Squelch OPEN" message is printed. Repeat this for about five times. .IP 5 4 -Calculate the mean diff (open level - close level) and the mean lower +Calculate the mean diff (open level - close level) and the mean lower (squelch close) value. Make sure to use at least four significant digits in your calculations. .IP 6 4 diff --git a/src/svxlink/ChangeLog b/src/svxlink/ChangeLog index a773ab3b..a2391a78 100644 --- a/src/svxlink/ChangeLog +++ b/src/svxlink/ChangeLog @@ -85,7 +85,6 @@ * Use the new configuration variable COMMAND_PTY to set up a PTY that can be used to send commands to a logic core. - * Filter out CTCSS band for voice output. Interference on CTCSS transmission could be caused by low frequency content in audio clips or incoming audio on Echolink for example. diff --git a/src/svxlink/modules/echolink/QsoImpl.cpp b/src/svxlink/modules/echolink/QsoImpl.cpp index abafef54..89dd88bf 100644 --- a/src/svxlink/modules/echolink/QsoImpl.cpp +++ b/src/svxlink/modules/echolink/QsoImpl.cpp @@ -209,7 +209,6 @@ QsoImpl::QsoImpl(const StationData &station, ModuleEchoLink *module) output_sel->enableAutoSelect(sink_handler, 0); output_sel->addSource(msg_pacer); output_sel->enableAutoSelect(msg_pacer, 10); - AudioSource *prev_src = output_sel; #if INTERNAL_SAMPLE_RATE == 16000