ua1zbe
/
PiScan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed errors for newer liquid version

This commit is contained in:
Ezra Taimuty-Loomis 2020-05-08 23:33:57 -04:00
parent 7425d0c0a4
commit ac625b0e9f
8 changed files with 14 additions and 8579 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cubic/modules/modem/analog/ModemAM.cpp
View File

@ -4,7 +4,7 @@
#include "ModemAM.h"
ModemAM::ModemAM() : ModemAnalog() {
demodAM = ampmodem_create(0.5, 0.0, LIQUID_AMPMODEM_DSB, 0);
demodAM = ampmodem_create(0.5, /*0.0, */LIQUID_AMPMODEM_DSB, 0);
useSignalOutput(true);
}

2
src/cubic/modules/modem/analog/ModemDSB.cpp
View File

@ -4,7 +4,7 @@
#include "ModemDSB.h"
ModemDSB::ModemDSB() : ModemAnalog() {
demodAM_DSB = ampmodem_create(0.5, 0.0, LIQUID_AMPMODEM_DSB, 1);
demodAM_DSB = ampmodem_create(0.5, /*0.0,*/ LIQUID_AMPMODEM_DSB, 1);
useSignalOutput(true);
}

6
src/cubic/modules/modem/analog/ModemFMStereo.cpp
View File

@ -239,10 +239,10 @@ void ModemFMStereo::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInp
nco_crcf_mix_down(fmkit->stereoPilot, y, &x);
// complex -> real
//float usb_discard;
float usb_discard;
float y[2];
//firhilbf_c2r_execute(fmkit->firStereoC2R, x, &demodStereoData[i], &usb_discard);
firhilbf_c2r_execute(fmkit->firStereoC2R, x, y);
firhilbf_c2r_execute(fmkit->firStereoC2R, x, &demodStereoData[i], &usb_discard);
//firhilbf_c2r_execute(fmkit->firStereoC2R, x, y);
demodOutputData[i] = y[0];
}

6
src/cubic/modules/modem/analog/ModemLSB.cpp
View File

@ -56,10 +56,10 @@ void ModemLSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *a
nco_crcf_mix_up(ssbShift, input->data[i], &x);
iirfilt_crcf_execute(ssbFilt, x, &y);
nco_crcf_mix_down(ssbShift, y, &x);
//float usb_discard;
float usb_discard;
float y[2];
//firhilbf_c2r_execute(c2rFilt, x, &demodOutputData[i], &usb_discard);
firhilbf_c2r_execute(c2rFilt, x, y);
firhilbf_c2r_execute(c2rFilt, x, &demodOutputData[i], &usb_discard);
//firhilbf_c2r_execute(c2rFilt, x, y);
demodOutputData[i] = y[0];
}

6
src/cubic/modules/modem/analog/ModemUSB.cpp
View File

@ -56,10 +56,10 @@ void ModemUSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *a
nco_crcf_mix_down(ssbShift, input->data[i], &x);
iirfilt_crcf_execute(ssbFilt, x, &y);
nco_crcf_mix_up(ssbShift, y, &x);
//float lsb_discard;
float lsb_discard;
float y[2];
//firhilbf_c2r_execute(c2rFilt, x, &lsb_discard, &demodOutputData[i]);
firhilbf_c2r_execute(c2rFilt, x, y);
firhilbf_c2r_execute(c2rFilt, x, &lsb_discard, &demodOutputData[i]);
//firhilbf_c2r_execute(c2rFilt, x, y);
demodOutputData[i] = y[1];
}

8566
src/external/liquid.h vendored
View File

File diff suppressed because it is too large Load Diff

2
src/server/SocketServer.cpp
View File

@ -312,7 +312,7 @@ void SocketServer::giveMessage(std::shared_ptr<Message> message){
void SocketServer::start_accept() {
// creates a socket
SocketConnection::pointer connection = SocketConnection::create(_acceptor.get_io_service());
SocketConnection::pointer connection = SocketConnection::create(_ioService);
// initiates an asynchronous accept operation
// to wait for a new connection.

3
src/server/SocketServer.h
View File

@ -74,7 +74,7 @@ private:
/* listener for socket connections */
class SocketServer: public BackendServer {
public:
SocketServer(ServerInterface& host, boost::asio::io_service& io_service) : BackendServer(host), _acceptor(io_service) {};
SocketServer(ServerInterface& host, boost::asio::io_service& io_service) : BackendServer(host), _ioService(io_service), _acceptor(io_service) {};
~SocketServer() {};
void start();
@ -83,6 +83,7 @@ public:
void giveMessage(std::shared_ptr<Message> message);
private:
io_service& _ioService;
tcp::acceptor _acceptor;
uint16_t _listenPort = DEFAULT_TCP_PORT;
int _activeConnections = 0;