diff --git a/doc/img/RemoteInput_plugin.png b/doc/img/RemoteInput_plugin.png index 534165f3a..ec2efec62 100644 Binary files a/doc/img/RemoteInput_plugin.png and b/doc/img/RemoteInput_plugin.png differ diff --git a/doc/img/RemoteInput_plugin.xcf b/doc/img/RemoteInput_plugin.xcf index 586a14cf4..71926e63c 100644 Binary files a/doc/img/RemoteInput_plugin.xcf and b/doc/img/RemoteInput_plugin.xcf differ diff --git a/doc/img/RemoteInput_plugin_05.png b/doc/img/RemoteInput_plugin_05.png index a5ec1f341..f36341341 100644 Binary files a/doc/img/RemoteInput_plugin_05.png and b/doc/img/RemoteInput_plugin_05.png differ diff --git a/doc/img/RemoteInput_plugin_05.xcf b/doc/img/RemoteInput_plugin_05.xcf index 04b617834..e77e3c45b 100644 Binary files a/doc/img/RemoteInput_plugin_05.xcf and b/doc/img/RemoteInput_plugin_05.xcf differ diff --git a/doc/img/RemoteOutput_plugin.png b/doc/img/RemoteOutput_plugin.png index f2d1d4fb7..b02631a0e 100644 Binary files a/doc/img/RemoteOutput_plugin.png and b/doc/img/RemoteOutput_plugin.png differ diff --git a/doc/img/RemoteOutput_plugin.xcf b/doc/img/RemoteOutput_plugin.xcf index 1b195f62e..b9177a4c2 100644 Binary files a/doc/img/RemoteOutput_plugin.xcf and b/doc/img/RemoteOutput_plugin.xcf differ diff --git a/plugins/samplesink/remoteoutput/readme.md b/plugins/samplesink/remoteoutput/readme.md index e3f53e7a1..c9c9a6551 100644 --- a/plugins/samplesink/remoteoutput/readme.md +++ b/plugins/samplesink/remoteoutput/readme.md @@ -6,9 +6,9 @@ This output sample sink plugin sends its samples over the network to a SDRangel Forward Error Correction with a Cauchy MDS block erasure codec is used to prevent block loss. This can make the UDP transmission more robust particularly over WiFi links. -The distant SDRangel instance to which the data stream is sent is controlled via its REST API using a separate control software for example [SDRangelcli](https://github.com/f4exb/sdrangelcli) +The remote SDRangel instance to which the data stream is sent is controlled via its REST API using a separate control software for example [SDRangelcli](https://github.com/f4exb/sdrangelcli) -The sample size used in the I/Q stream is the Rx sample size of the local instance. Possible conversion takes place in the distant Remote source channel plugin to match the Rx sample size of the distant instance. Best performace is obtained when both instances use the same sample size. +The sample size used in the I/Q stream is the Rx sample size of the local instance. Possible conversion takes place in the remote Remote source channel plugin to match the Rx sample size of the remote instance. Best performace is obtained when both instances use the same sample size. It is present only in Linux binary releases. @@ -22,11 +22,11 @@ The plugin will be built only if the [CM256cc library](https://github.com/f4exb/

1: Start/Stop

-Device start / stop button. +Device start / stop button. - Blue triangle icon: device is ready and can be started - Green square icon: device is running and can be stopped - +

2: Stream sample rate

I/Q sample rate in kS/s of the stream that is sent over the network. @@ -39,7 +39,7 @@ This is the center frequency in kHz of the remote instance device. This is the remote instance baseband sample rate. It can be a power of two multiple of the stream sample rate (2) but it will not work for other values. -

5: Stream controls and API destination

+

5: Stream controls and API destination

![SDR Remote output sample rate GUI](../../../doc/img/RemoteOutput_plugin_05.png) @@ -57,8 +57,8 @@ The value is a percentage of the nominal time it takes to process a block of sam - Delay percentage: _d_ - Number of FEC blocks: _F_ - There are 127 blocks of I/Q data per frame (1 meta block for 128 blocks) and each I/Q data block of 512 bytes (128 samples) has a 8 bytes header (2 samples) thus there are 126 samples remaining effectively. This gives the constant 127*126 = 16002 samples per frame in the formula - -Formula: ((127 ✕ 126 ✕ _d_) / _SR_) / (128 + _F_) + +Formula: ((127 ✕ 126 ✕ _d_) / _SR_) / (128 + _F_)

5.3: remote instance device set index

@@ -105,33 +105,35 @@ This counter counts the unrecoverable error conditions found (i.e. 6.4 between 1 This HH:mm:ss time display shows the time since the reset events counters button (4.6) was pushed. -

7: Distant transmitter queue length gauge

+

7: Remote transmitter queue length gauge

This is ratio of the reported number of data frame blocks in the remote queue over the total number of blocks in the queue. -

8: Distant transmitter queue length status

+

8: Remote transmitter queue length status

This is the detail of the ratio shown in the gauge. Each frame block is a block of 127 ✕ 126 samples (16 bit I or Q samples) or 127 ✕ 63 samples (24 bit I or Q samples). -

9: Distant server API address and port

+

9: Remote server test

+ +Test remote connection with its API. ![SDR Remote input stream GUI](../../../doc/img/RemoteInput_plugin_05.png) -

9.1: API connection indicator

+

9.1: Remote connection indicator

-The "API" label is lit in green when the connection is successful +The "Remote" label is lit in green when the connection is successful

9.2: API IP address

-IP address of the distant SDRangel instance REST API +IP address of the remote SDRangel instance REST API

9.3: API port

-Port of the distant SDRangel instance REST API +Port of the remote SDRangel instance REST API -

9.4: Validation button

+

9.4: Get information button

-When the return key is hit within the address (9.2) or port (9.3) the changes are effective immediately. You can also use this button to set again these values. Clicking on this button will send a request to the API to get the distant SDRangel instance information that is displayed in the API message box (8) +When the return key is hit within the address (9.2) or port (9.3) the changes are effective immediately. You can also use this button to set again these values. Clicking on this button will send a request to the API to get the remote SDRangel instance information that is displayed in the API message box (8)

10: Local data address and port

@@ -139,20 +141,20 @@ When the return key is hit within the address (9.2) or port (9.3) the changes ar

10.1: Data IP address

-IP address of the local network interface the distant SDRangel instance sends the data to +IP address of the local network interface the remote SDRangel instance sends the data to

10.2: Data port

-Local port the distant SDRangel instance sends the data to +Local port the remote SDRangel instance sends the data to

10.3: Validation button

-When the return key is hit within the address (10.2) or port (10.3) the changes are effective immediately. You can also use this button to set again these values. +When the return key is hit within the address (10.2) or port (10.3) the changes are effective immediately. You can also use this button to set again these values.

11: Status message

The API status is displayed in this box. It shows "API OK" when the connection is successful and reply is OK -

12: API information

+

12: Remote information

-This is the information returned by the API and is the distance SDRangel instance information if transaction is successful +This is the information returned by the remote when connection with its API is successful diff --git a/plugins/samplesink/remoteoutput/remoteoutputgui.ui b/plugins/samplesink/remoteoutput/remoteoutputgui.ui index 453f2fc18..044929aa5 100644 --- a/plugins/samplesink/remoteoutput/remoteoutputgui.ui +++ b/plugins/samplesink/remoteoutput/remoteoutputgui.ui @@ -599,7 +599,7 @@ - 30 + 50 0 @@ -607,7 +607,7 @@ Green if communication OK else KO - API + Remote @@ -626,7 +626,7 @@ 000.000.000.000 - 0... + 0.0.0.0 @@ -678,10 +678,10 @@ - Set API address and port + Get remote information - Set + Info @@ -693,7 +693,7 @@ - 30 + 50 0 @@ -717,7 +717,7 @@ 000.000.000.000 - 0... + 0.0.0.0 diff --git a/plugins/samplesource/remoteinput/readme.md b/plugins/samplesource/remoteinput/readme.md index ba53c7ce7..6293c6398 100644 --- a/plugins/samplesource/remoteinput/readme.md +++ b/plugins/samplesource/remoteinput/readme.md @@ -8,9 +8,9 @@ Forward Error Correction with a Cauchy MDS block erasure codec is used to preven Please note that there is no provision for handling out of sync UDP blocks. It is assumed that frames and block numbers always increase with possible blocks missing. Such out of sync situation has never been encountered in practice. -The distant SDRangel instance that sends the data stream is controlled via its REST API using a separate control software for example [SDRangelcli](https://github.com/f4exb/sdrangelcli) +The remote SDRangel instance that sends the data stream is controlled via its REST API using a separate control software for example [SDRangelcli](https://github.com/f4exb/sdrangelcli) -A sample size conversion takes place if the stream sample size sent by the distant instance and the Rx sample size of the local instance do not match (i.e. 16 to 24 bits or 24 to 16 bits). Best performace is obtained when both instances use the same sample size. +A sample size conversion takes place if the stream sample size sent by the remote instance and the Rx sample size of the local instance do not match (i.e. 16 to 24 bits or 24 to 16 bits). Best performace is obtained when both instances use the same sample size. It is present only in Linux binary releases. @@ -31,7 +31,7 @@ Device start / stop button.

2: Frequency

-This is the center frequency in Hz sent in the meta data from the distant SDRangel instance and corresponds to the center frequency of reception. The sub kHz value (000 to 999 Hz) is represented in smaller digits on the right. +This is the center frequency in Hz sent in the meta data from the remote SDRangel instance and corresponds to the center frequency of reception. The sub kHz value (000 to 999 Hz) is represented in smaller digits on the right.

3: Stream sample rate

@@ -80,11 +80,11 @@ The system tries to compensate read / write unbalance however at start or when a

6.1: Sample size

-This is the size in bits of a I or Q sample sent in the stream by the distant server. +This is the size in bits of a I or Q sample sent in the stream by the remote server.

6.2: Total number of frames and number of FEC blocks

-This is the total number of frames and number of FEC blocks separated by a slash '/' as sent in the meta data block thus acknowledged by the distant server. When you set the number of FEC blocks with (4.1) the effect may not be immediate and this information can be used to monitor when it gets effectively set in the distant server. +This is the total number of frames and number of FEC blocks separated by a slash '/' as sent in the meta data block thus acknowledged by the remote server. When you set the number of FEC blocks with (4.1) the effect may not be immediate and this information can be used to monitor when it gets effectively set in the remote server. A frame consists of 128 data blocks (1 meta data block followed by 127 I/Q data blocks) and a variable number of FEC blocks used to protect the UDP transmission with a Cauchy MDS block erasure correction. @@ -124,25 +124,27 @@ This counter counts the unrecoverable error conditions found (i.e. 4.4 between 1 This HH:mm:ss time display shows the time since the reset events counters button (4.6) was pushed. -

7: Distant server API address and port

+

7: Remote server test

+ +Test remote connection with its API. ![SDR Remote input stream GUI](../../../doc/img/RemoteInput_plugin_05.png) -

7.1: API connection indicator

+

7.1: Remote connection indicator

-The "API" label is lit in green when the connection is successful +The "Remote" label is lit in green when the connection is successful

7.2: API IP address

-IP address of the distant SDRangel instance REST API +IP address of the remote SDRangel instance REST API

7.3: API port

-Port of the distant SDRangel instance REST API +Port of the remote SDRangel instance REST API -

7.4: Validation button

+

7.4: Get information button

-When the return key is hit within the address (5.2) or port (5.3) the changes are effective immediately. You can also use this button to set again these values. Clicking on this button will send a request to the API to get the distant SDRangel instance information that is displayed in the API message box (8) +When the return key is hit within the address (5.2) or port (5.3) the changes are effective immediately. You can also use this button to set again these values. Clicking on this button will send a request to the API to get the remote SDRangel instance information that is displayed in the API message box (8)

8: Local network interface address and port for data reception

@@ -150,11 +152,11 @@ When the return key is hit within the address (5.2) or port (5.3) the changes ar

8.1: Interface IP address

-IP address of the local network interface the distant SDRangel instance sends the data to. Effective when the validation button (8.3) is pressed. +IP address of the local network interface the remote SDRangel instance sends the data to. Effective when the validation button (8.3) is pressed.

8.2: Interface port

-Local port the distant SDRangel instance sends the data to. Effective when the validation button (8.3) is pressed. +Local port the remote SDRangel instance sends the data to. Effective when the validation button (8.3) is pressed.

8.3: Validation button

@@ -172,6 +174,6 @@ This is the address of the multicast group. Effective when the validation button The API status is displayed in this box. It shows "API OK" when the connection is successful and reply is OK -

12: API information

+

12: Remote information

-This is the information returned by the API and is the distance SDRangel instance information if transaction is successful +This is the information returned by the remote when connection with its API is successful diff --git a/plugins/samplesource/remoteinput/remoteinputgui.ui b/plugins/samplesource/remoteinput/remoteinputgui.ui index 305de464e..e6f0a9750 100644 --- a/plugins/samplesource/remoteinput/remoteinputgui.ui +++ b/plugins/samplesource/remoteinput/remoteinputgui.ui @@ -587,12 +587,12 @@ - 30 + 50 0 - API + Remote @@ -687,10 +687,10 @@ - Set API link + Get remote information - Set + Info @@ -702,7 +702,7 @@ - 30 + 50 0