1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-23 10:05:46 -05:00

Merge master into dev

This commit is contained in:
f4exb 2019-07-23 22:59:30 +02:00
commit 47d919d55d
17 changed files with 23 additions and 23 deletions

View File

@ -80,7 +80,7 @@ message(STATUS "${APPLICATION_NAME} Version: ${sdrangel_VERSION}")
add_definitions("-DSDRANGEL_LIB_VERSION=\"${sdrangel_VERSION_MAJOR}.${sdrangel_VERSION_MINOR}.${sdrangel_VERSION_PATCH}\"") add_definitions("-DSDRANGEL_LIB_VERSION=\"${sdrangel_VERSION_MAJOR}.${sdrangel_VERSION_MINOR}.${sdrangel_VERSION_PATCH}\"")
add_definitions("-DSDRANGEL_VERSION=\"${sdrangel_VERSION}\"") add_definitions("-DSDRANGEL_VERSION=\"${sdrangel_VERSION}\"")
# configure CPACK infomation # configure CPACK information
set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}") set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "SDR Rx/Tx software for Airspy, Airspy HF+, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "SDR Rx/Tx software for Airspy, Airspy HF+, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube")
set(CPACK_PACKAGE_VENDOR "${COMPANY}") set(CPACK_PACKAGE_VENDOR "${COMPANY}")

View File

@ -106,7 +106,7 @@ void HttpConnectionHandler::run()
} }
catch (...) catch (...)
{ {
qCritical("HttpConnectionHandler (%p): an uncatched exception occured in the thread",this); qCritical("HttpConnectionHandler (%p): an uncatched exception occurred in the thread",this);
} }
socket->close(); socket->close();
delete socket; delete socket;
@ -167,7 +167,7 @@ void HttpConnectionHandler::setBusy()
void HttpConnectionHandler::readTimeout() void HttpConnectionHandler::readTimeout()
{ {
qDebug("HttpConnectionHandler (%p): read timeout occured",this); qDebug("HttpConnectionHandler (%p): read timeout occurred",this);
//Commented out because QWebView cannot handle this. //Commented out because QWebView cannot handle this.
//socket->write("HTTP/1.1 408 request timeout\r\nConnection: close\r\n\r\n408 request timeout\r\n"); //socket->write("HTTP/1.1 408 request timeout\r\nConnection: close\r\n\r\n408 request timeout\r\n");
@ -267,7 +267,7 @@ void HttpConnectionHandler::read()
} }
catch (...) catch (...)
{ {
qCritical("HttpConnectionHandler (%p): An uncatched exception occured in the request handler",this); qCritical("HttpConnectionHandler (%p): An uncatched exception occurred in the request handler",this);
} }
// Finalize sending the response if not already done // Finalize sending the response if not already done

View File

@ -132,7 +132,7 @@ public slots:
private slots: private slots:
/** Received from the socket when a read-timeout occured */ /** Received from the socket when a read-timeout occurred */
void readTimeout(); void readTimeout();
/** Received from the socket when incoming data can be read */ /** Received from the socket when incoming data can be read */

View File

@ -31,7 +31,7 @@ void FileLogger::refreshSettings()
void FileLogger::refreshQtSettings() void FileLogger::refreshQtSettings()
{ {
// Save old file name for later comparision with new settings // Save old file name for later comparison with new settings
QString oldFileName = fileName; QString oldFileName = fileName;
// Load new config settings // Load new config settings
@ -67,7 +67,7 @@ void FileLogger::refreshQtSettings()
void FileLogger::refreshFileLogSettings() void FileLogger::refreshFileLogSettings()
{ {
// Save old file name for later comparision with new settings // Save old file name for later comparison with new settings
QString oldFileName = fileName; QString oldFileName = fileName;
// Load new config settings // Load new config settings

View File

@ -889,7 +889,7 @@ static const char *tmc_events[TMC_EVENTS][4] = {
{"857","(Q) obstruction(s) on roadway {something that does block the road or part of it}","901","0"}, {"857","(Q) obstruction(s) on roadway {something that does block the road or part of it}","901","0"},
{"858","(Q) obstructions on the road. Danger","902","0"}, {"858","(Q) obstructions on the road. Danger","902","0"},
{"859","(Q) obstructions on the road. Passable with care","981","0"}, {"859","(Q) obstructions on the road. Passable with care","981","0"},
{"860","(Q) object(s) on roadway {something that does not neccessarily block the road or part of it} ","61","0"}, {"860","(Q) object(s) on roadway {something that does not necessarily block the road or part of it} ","61","0"},
{"861","(Q) object(s) on the road. Danger","63","0"}, {"861","(Q) object(s) on the road. Danger","63","0"},
{"862","(Q) shed load(s)","210","0"}, {"862","(Q) shed load(s)","210","0"},
{"863","(Q) shed load(s). Danger","359","0"}, {"863","(Q) shed load(s). Danger","359","0"},

View File

@ -103,7 +103,7 @@ struct bitvect
// Return m modulo (X^N+p). // Return m modulo (X^N+p).
// p is typically a generator polynomial of degree N // p is typically a generator polynomial of degree N
// with the highest-coefficient monomial ommitted. // with the highest-coefficient monomial omitted.
// m is packed into nm words of type Tm. // m is packed into nm words of type Tm.
// The MSB of m[0] is the highest-order coefficient of m. // The MSB of m[0] is the highest-order coefficient of m.

View File

@ -14,7 +14,7 @@ This plugin can be used to view digital amateur analog television transmissions
The whole bandwidth available to the channel is used. That is it runs at the device sample rate possibly downsampled by a power of two in the source plugin. The whole bandwidth available to the channel is used. That is it runs at the device sample rate possibly downsampled by a power of two in the source plugin.
⚠ Note that DVB-S2 support is experimental. You may need to move some settings back and forth to achieve constellation lock and decode. For exmple change mode or slightly move back adn forth center frequency. ⚠ Note that DVB-S2 support is experimental. You may need to move some settings back and forth to achieve constellation lock and decode. For exmple change mode or slightly move back and forth center frequency.
<h2>Interface</h2> <h2>Interface</h2>

View File

@ -74,7 +74,7 @@ You may select the type of tracker with this combo box:
This is the order of m-ary PSK modulation for the PLL. It can be selected in powers of 2: This is the order of m-ary PSK modulation for the PLL. It can be selected in powers of 2:
- **1**: Continous Wave (no modulation) - **1**: Continuous Wave (no modulation)
- **2**: BPSK - **2**: BPSK
- **4**: QPSK - **4**: QPSK
- **8**: 8-PSK - **8**: 8-PSK

View File

@ -121,4 +121,4 @@ Use this slider to adjust gain in manual mode. The gain varies from -89 to 0 dB
<h3>10: Bias tee control</h3> <h3>10: Bias tee control</h3>
Use this toggle button to activate or de-activate the bias tee. Note that according to BladeRF v2 specs the bias tee is simultanously present on all Tx RF ports. The GUI of the sibling channel if present is adjusted automatically. Use this toggle button to activate or de-activate the bias tee. Note that according to BladeRF v2 specs the bias tee is simultaneously present on all Tx RF ports. The GUI of the sibling channel if present is adjusted automatically.

View File

@ -59,7 +59,7 @@ public:
/** Returns a pointer to the (constant) error description. /** Returns a pointer to the (constant) error description.
* @return A pointer to a \c const \c char*. The underlying memory * @return A pointer to a \c const \c char*. The underlying memory
* is in posession of the \c Exception object. Callers \a must * is in possession of the \c Exception object. Callers \a must
* not attempt to free the memory. * not attempt to free the memory.
*/ */
virtual const char* what() const throw (){ return m_sMsg.c_str(); } virtual const char* what() const throw (){ return m_sMsg.c_str(); }

View File

@ -4,7 +4,7 @@
This output sample sink plugin sends its samples to a device interfaced with [SoapySDR](https://github.com/pothosware/SoapySDR/wiki). This output sample sink plugin sends its samples to a device interfaced with [SoapySDR](https://github.com/pothosware/SoapySDR/wiki).
SoapySDR is a [C/C++ API](https://github.com/pothosware/SoapySDR/blob/master/include/SoapySDR/Device.hpp) that interfaces SDR hardware on one side and application software on the other. Due to its very generic nature it was fairly difficult to implement and specific UI widgets were developped to handle specific types of parameters. The level of control depends on how the device API was implemented by the vendors. On application side some parts of the API have not been implemented and can be left as possible enhancements (see next). In any case it is recommended to use the native plugins if they are available. SoapySDR is a [C/C++ API](https://github.com/pothosware/SoapySDR/blob/master/include/SoapySDR/Device.hpp) that interfaces SDR hardware on one side and application software on the other. Due to its very generic nature it was fairly difficult to implement and specific UI widgets were developed to handle specific types of parameters. The level of control depends on how the device API was implemented by the vendors. On application side some parts of the API have not been implemented and can be left as possible enhancements (see next). In any case it is recommended to use the native plugins if they are available.
SoapySDR devices appear in the list of available devices in the order they are listed in the API call to SoapySDR. If more than one device controlled by SoapySDR is listed then its sequence number is incremented like: SoapySDR devices appear in the list of available devices in the order they are listed in the API call to SoapySDR. If more than one device controlled by SoapySDR is listed then its sequence number is incremented like:
@ -55,7 +55,7 @@ The following paragraphs list the known issues or oddities.
<h3>BladeRF</h3> <h3>BladeRF</h3>
It is very important NOT to use SoapySDR. The default parameters are set to flash the FPGA but as this does not suceeds it results in a FPGA image wipe out and the device returns in "Cypress" mode. It is not too difficult to recover but there is no point risking the hassle. It is very important NOT to use SoapySDR. The default parameters are set to flash the FPGA but as this does not succeeds it results in a FPGA image wipe out and the device returns in "Cypress" mode. It is not too difficult to recover but there is no point risking the hassle.
<h3>Red Pitaya</h3> <h3>Red Pitaya</h3>

View File

@ -138,9 +138,9 @@ This selects the gain processing in use. Values are fetched automatically from t
<h3>10: Manual gain control</h3> <h3>10: Manual gain control</h3>
Use this slider to adjust gain in manual mode. This control is disabled in non manual modes (all modes but manual). The minumum, maximum and step values are fetched automatically from the device and may vary depending on the center frequency. For frequencies around 400 MHz the gain varies from -16 to 60 dB in 1 dB steps. Use this slider to adjust gain in manual mode. This control is disabled in non manual modes (all modes but manual). The minimum, maximum and step values are fetched automatically from the device and may vary depending on the center frequency. For frequencies around 400 MHz the gain varies from -16 to 60 dB in 1 dB steps.
<h3>11: Bias tee control</h3> <h3>11: Bias tee control</h3>
Use this toggle button to activate or de-activate the bias tee. Note that according to BladeRF v2 specs the bias tee is simultanously present on all Rx RF ports. The GUI of the sibling channel if present is adjusted automatically. Use this toggle button to activate or de-activate the bias tee. Note that according to BladeRF v2 specs the bias tee is simultaneously present on all Rx RF ports. The GUI of the sibling channel if present is adjusted automatically.

View File

@ -4,7 +4,7 @@
This input sample source plugin gets its samples from a device interfaced with [SoapySDR](https://github.com/pothosware/SoapySDR/wiki). This input sample source plugin gets its samples from a device interfaced with [SoapySDR](https://github.com/pothosware/SoapySDR/wiki).
SoapySDR is a [C/C++ API](https://github.com/pothosware/SoapySDR/blob/master/include/SoapySDR/Device.hpp) that interfaces SDR hardware on one side and application software on the other. Due to its very generic nature it was fairly difficult to implement and specific UI widgets were developped to handle specific types of parameters. The level of control depends on how the device API was implemented by the vendors. On application side some parts of the API have not been implemented and can be left as possible enhancements (see next). In any case it is recommended to use the native plugins if they are available. SoapySDR is a [C/C++ API](https://github.com/pothosware/SoapySDR/blob/master/include/SoapySDR/Device.hpp) that interfaces SDR hardware on one side and application software on the other. Due to its very generic nature it was fairly difficult to implement and specific UI widgets were developed to handle specific types of parameters. The level of control depends on how the device API was implemented by the vendors. On application side some parts of the API have not been implemented and can be left as possible enhancements (see next). In any case it is recommended to use the native plugins if they are available.
SoapySDR devices appear in the list of available devices in the order they are listed in the API call to SoapySDR. If more than one device controlled by SoapySDR is listed then its sequence number is incremented like: SoapySDR devices appear in the list of available devices in the order they are listed in the API call to SoapySDR. If more than one device controlled by SoapySDR is listed then its sequence number is incremented like:
@ -59,7 +59,7 @@ The following paragraphs list the known issues or oddities.
<h3>BladeRF</h3> <h3>BladeRF</h3>
It is very important NOT to use SoapySDR. The default parameters are set to flash the FPGA but as this does not suceeds it results in a FPGA image wipe out and the device returns in "Cypress" mode. It is not too difficult to recover but there is no point risking the hassle. It is very important NOT to use SoapySDR. The default parameters are set to flash the FPGA but as this does not succeeds it results in a FPGA image wipe out and the device returns in "Cypress" mode. It is not too difficult to recover but there is no point risking the hassle.
<h3>SDRplay RSP2</h3> <h3>SDRplay RSP2</h3>

View File

@ -90,7 +90,7 @@ func copyContent(reader *bufio.Reader, writer *bufio.Writer, blockSize uint) {
sz += int64(n) sz += int64(n)
break break
} else { } else {
fmt.Println("An error occured during content copy. Aborting") fmt.Println("An error occurred during content copy. Aborting")
break break
} }
} else { } else {

View File

@ -34,7 +34,7 @@ Use this button to delete the arguments currently selected in the above panel (3
<h2>5 Edit arguments</h2> <h2>5 Edit arguments</h2>
Use this line editor to change the arguments currently selected in the above panel (3). The text will be commited when the focus is lost. Use this line editor to change the arguments currently selected in the above panel (3). The text will be committed when the focus is lost.
<h2>6 Cancel button</h2> <h2>6 Cancel button</h2>

View File

@ -574,7 +574,7 @@ private:
TriggerData m_triggerData; //!< Trigger data TriggerData m_triggerData; //!< Trigger data
bool m_prevCondition; //!< Condition (above threshold) at previous sample bool m_prevCondition; //!< Condition (above threshold) at previous sample
uint32_t m_triggerDelayCount; //!< Counter of samples for delay uint32_t m_triggerDelayCount; //!< Counter of samples for delay
uint32_t m_triggerCounter; //!< Counter of trigger occurences uint32_t m_triggerCounter; //!< Counter of trigger occurrences
uint32_t m_trues; //!< Count of true conditions for holdoff processing uint32_t m_trues; //!< Count of true conditions for holdoff processing
uint32_t m_falses; //!< Count of false conditions for holdoff processing uint32_t m_falses; //!< Count of false conditions for holdoff processing

View File

@ -5,7 +5,7 @@ This folder holds the objects specific to the server (headless) version of SDRan
This document focuses on the functional description of SDRangel server. More details on the technical architecture can be found in the developer's documentation. This document focuses on the functional description of SDRangel server. More details on the technical architecture can be found in the developer's documentation.
The main motivations are: The main motivations are:
- be able to run SDRangel on hardware with less CPU/GPU requirements in particular without OpenGL suport. - be able to run SDRangel on hardware with less CPU/GPU requirements in particular without OpenGL support.
- be used in sophisticated remote transponders or repeaters in a headless server configuration. - be used in sophisticated remote transponders or repeaters in a headless server configuration.
- possibility to use Docker technology to host SDRangel server instances in a distributed environment. - possibility to use Docker technology to host SDRangel server instances in a distributed environment.
- possibility to use SDRangel remotely for the RF device interface even more distributed architectures can be supported to share workload in a cluster. - possibility to use SDRangel remotely for the RF device interface even more distributed architectures can be supported to share workload in a cluster.