joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into csdr++

Browse Source
This commit is contained in:
Jakob Ketterl 2021-07-05 13:06:06 +02:00
commit 59de2628c3
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/scripts/install-owrx-tools.sh
View File

@ -43,8 +43,8 @@ rm -rf csdr
git clone https://github.com/jketterl/codecserver.git git clone https://github.com/jketterl/codecserver.git
mkdir -p /usr/local/etc/codecserver mkdir -p /usr/local/etc/codecserver
cp codecserver/conf/codecserver.conf /usr/local/etc/codecserver cp codecserver/conf/codecserver.conf /usr/local/etc/codecserver
#latest develop as of 2021-06-17 (docker image) #latest develop as of 2021-07-04 (optional checksum fix)
cmakebuild codecserver 7dc6084b2376944df238efba4ed48473750f67d3 cmakebuild codecserver d73c9a56a773355679bc2d4a10f199b62223d7a0
git clone https://github.com/jketterl/digiham.git git clone https://github.com/jketterl/digiham.git
#latest develop as of 2021-06-15 (DMR LCSS overflow fix; D-Star alternate terminator) #latest develop as of 2021-06-15 (DMR LCSS overflow fix; D-Star alternate terminator)

8
owrx/form/input/device.py
View File

@ -1,4 +1,6 @@
from owrx.form.input import Input, CheckboxInput, DropdownInput, DropdownEnum, TextInput from owrx.form.input import Input, CheckboxInput, DropdownInput, DropdownEnum, TextInput
from owrx.form.input.converter import OptionalConverter
from owrx.form.input.validator import RequiredValidator
from owrx.soapy import SoapySettings from owrx.soapy import SoapySettings
@ -169,7 +171,11 @@ class DirectSamplingInput(DropdownInput):
class RemoteInput(TextInput): class RemoteInput(TextInput):
def __init__(self): def __init__(self):
super().__init__( super().__init__(
"remote", "Remote IP and Port", infotext="Remote hostname or IP and port to connect to. Format = IP:Port" "remote",
"Remote IP and Port",
infotext="Remote hostname or IP and port to connect to. Format = IP:Port",
converter=OptionalConverter(),
validator=RequiredValidator(),
) )

6
owrx/source/soapy_remote.py
View File

@ -1,6 +1,7 @@
from owrx.source.soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription from owrx.source.soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription
from owrx.form.input import Input, TextInput from owrx.form.input import Input, TextInput
from owrx.form.input.device import RemoteInput from owrx.form.input.device import RemoteInput
from owrx.form.input.converter import OptionalConverter
from typing import List from typing import List
@ -28,7 +29,10 @@ class SoapyRemoteDeviceDescription(SoapyConnectorDeviceDescription):
return super().getInputs() + [ return super().getInputs() + [
RemoteInput(), RemoteInput(),
TextInput( TextInput(
"remote_driver", "Remote driver", infotext="SoapySDR driver to be used on the remote SoapySDRServer" "remote_driver",
"Remote driver",
infotext="SoapySDR driver to be used on the remote SoapySDRServer",
converter=OptionalConverter(),
), ),
] ]