Merge branch 'master' into M17_AX25_FM

This commit is contained in:
Jonathan Naylor
2021-04-25 10:26:57 +01:00
27 changed files with 170 additions and 170 deletions

View File

@@ -28,7 +28,7 @@
class CLCDproc : public CDisplay
{
public:
CLCDproc(std::string address, unsigned int port, unsigned int localPort, const std::string& callsign, unsigned int dmrid, bool displayClock, bool utc, bool duplex, bool dimOnIdle);
CLCDproc(std::string address, unsigned int port, unsigned short localPort, const std::string& callsign, unsigned int dmrid, bool displayClock, bool utc, bool duplex, bool dimOnIdle);
virtual ~CLCDproc();
virtual bool open();
@@ -77,7 +77,7 @@ protected:
private:
std::string m_address;
unsigned int m_port;
unsigned int m_localPort;
unsigned short m_localPort;
std::string m_callsign;
unsigned int m_dmrid;
bool m_displayClock;