MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-23 00:35:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refresh the display handlers.

Browse Source
This commit is contained in:
Jonathan Naylor
2023-10-03 16:20:29 +01:00
parent 3df5c6041c
commit 45821b1881
11 changed files with 642 additions and 639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CASTInfo.cpp
View File

@@ -42,11 +42,11 @@ void CCASTInfo::setIdleInt()
unsigned char info[100U]; unsigned char info[100U];
CNetworkInfo* m_network; CNetworkInfo* m_network;
passCounter ++; passCounter++;
if (passCounter > 253U) if (passCounter > 253U)
networkInfoInitialized = false; networkInfoInitialized = false;
if (! networkInfoInitialized) { if (!networkInfoInitialized) {
//LogMessage("Initialize CNetworkInfo"); //LogMessage("Initialize CNetworkInfo");
info[0]=0; info[0]=0;
m_network = new CNetworkInfo; m_network = new CNetworkInfo;
@@ -60,8 +60,6 @@ void CCASTInfo::setIdleInt()
networkInfoInitialized = true; networkInfoInitialized = true;
passCounter = 0; passCounter = 0;
} }
} }
void CCASTInfo::setErrorInt(const char* text) void CCASTInfo::setErrorInt(const char* text)

2
CASTInfo.h
View File

@@ -41,7 +41,7 @@ protected:
virtual void setErrorInt(const char* text); virtual void setErrorInt(const char* text);
virtual void setLockoutInt(); virtual void setLockoutInt();
virtual void setQuitInt(); virtual void setQuitInt();
virtual void setFMInt(); virtual void setFMInt();
virtual void writeDStarInt(const char* my1, const char* my2, const char* your, const char* type, const char* reflector); virtual void writeDStarInt(const char* my1, const char* my2, const char* your, const char* type, const char* reflector);
virtual void clearDStarInt(); virtual void clearDStarInt();

8
Display.h
View File

@@ -50,7 +50,7 @@ public:
void clearDStar(); void clearDStar();
void writeDMR(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type); void writeDMR(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type);
void writeDMR(unsigned int slotNo, const class CUserDBentry& src, bool group, const std::string& dst, const char* type); void writeDMR(unsigned int slotNo, const CUserDBentry& src, bool group, const std::string& dst, const char* type);
void writeDMRRSSI(unsigned int slotNo, unsigned char rssi); void writeDMRRSSI(unsigned int slotNo, unsigned char rssi);
void writeDMRBER(unsigned int slotNo, float ber); void writeDMRBER(unsigned int slotNo, float ber);
void writeDMRTA(unsigned int slotNo, const unsigned char* talkerAlias, const char* type); void writeDMRTA(unsigned int slotNo, const unsigned char* talkerAlias, const char* type);
@@ -67,7 +67,7 @@ public:
void clearP25(); void clearP25();
void writeNXDN(const char* source, bool group, unsigned int dest, const char* type); void writeNXDN(const char* source, bool group, unsigned int dest, const char* type);
void writeNXDN(const class CUserDBentry& source, bool group, unsigned int dest, const char* type); void writeNXDN(const CUserDBentry& source, bool group, unsigned int dest, const char* type);
void writeNXDNRSSI(unsigned char rssi); void writeNXDNRSSI(unsigned char rssi);
void writeNXDNBER(float ber); void writeNXDNBER(float ber);
void clearNXDN(); void clearNXDN();
@@ -101,7 +101,7 @@ protected:
virtual void clearDStarInt() = 0; virtual void clearDStarInt() = 0;
virtual void writeDMRInt(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type) = 0; virtual void writeDMRInt(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type) = 0;
virtual int writeDMRIntEx(unsigned int slotNo, const class CUserDBentry& src, bool group, const std::string& dst, const char* type); virtual int writeDMRIntEx(unsigned int slotNo, const CUserDBentry& src, bool group, const std::string& dst, const char* type);
virtual void writeDMRRSSIInt(unsigned int slotNo, unsigned char rssi); virtual void writeDMRRSSIInt(unsigned int slotNo, unsigned char rssi);
virtual void writeDMRTAInt(unsigned int slotNo, const unsigned char* talkerAlias, const char* type); virtual void writeDMRTAInt(unsigned int slotNo, const unsigned char* talkerAlias, const char* type);
virtual void writeDMRBERInt(unsigned int slotNo, float ber); virtual void writeDMRBERInt(unsigned int slotNo, float ber);
@@ -118,7 +118,7 @@ protected:
virtual void clearP25Int() = 0; virtual void clearP25Int() = 0;
virtual void writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type) = 0; virtual void writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type) = 0;
virtual int writeNXDNIntEx(const class CUserDBentry& source, bool group, unsigned int dest, const char* type); virtual int writeNXDNIntEx(const CUserDBentry& source, bool group, unsigned int dest, const char* type);
virtual void writeNXDNRSSIInt(unsigned char rssi); virtual void writeNXDNRSSIInt(unsigned char rssi);
virtual void writeNXDNBERInt(float ber); virtual void writeNXDNBERInt(float ber);
virtual void clearNXDNInt() = 0; virtual void clearNXDNInt() = 0;

64
LCDproc.h
View File

@@ -28,51 +28,51 @@
class CLCDproc : public CDisplay class CLCDproc : public CDisplay
{ {
public: public:
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); 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 ~CLCDproc();
virtual bool open(); virtual bool open();
virtual void close(); virtual void close();
protected: protected:
virtual void setIdleInt(); virtual void setIdleInt();
virtual void setErrorInt(const char* text); virtual void setErrorInt(const char* text);
virtual void setLockoutInt(); virtual void setLockoutInt();
virtual void setQuitInt(); virtual void setQuitInt();
virtual void setFMInt(); virtual void setFMInt();
virtual void writeDStarInt(const char* my1, const char* my2, const char* your, const char* type, const char* reflector); virtual void writeDStarInt(const char* my1, const char* my2, const char* your, const char* type, const char* reflector);
virtual void writeDStarRSSIInt(unsigned char rssi); virtual void writeDStarRSSIInt(unsigned char rssi);
virtual void clearDStarInt(); virtual void clearDStarInt();
virtual void writeDMRInt(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type); virtual void writeDMRInt(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type);
virtual void writeDMRRSSIInt(unsigned int slotNo, unsigned char rssi); virtual void writeDMRRSSIInt(unsigned int slotNo, unsigned char rssi);
virtual void clearDMRInt(unsigned int slotNo); virtual void clearDMRInt(unsigned int slotNo);
virtual void writeFusionInt(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin); virtual void writeFusionInt(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin);
virtual void writeFusionRSSIInt(unsigned char rssi); virtual void writeFusionRSSIInt(unsigned char rssi);
virtual void clearFusionInt(); virtual void clearFusionInt();
virtual void writeP25Int(const char* source, bool group, unsigned int dest, const char* type); virtual void writeP25Int(const char* source, bool group, unsigned int dest, const char* type);
virtual void writeP25RSSIInt(unsigned char rssi); virtual void writeP25RSSIInt(unsigned char rssi);
virtual void clearP25Int(); virtual void clearP25Int();
virtual void writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type); virtual void writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type);
virtual void writeNXDNRSSIInt(unsigned char rssi); virtual void writeNXDNRSSIInt(unsigned char rssi);
virtual void clearNXDNInt(); virtual void clearNXDNInt();
virtual void writeM17Int(const char* source, const char* dest, const char* type); virtual void writeM17Int(const char* source, const char* dest, const char* type);
virtual void writeM17RSSIInt(unsigned char rssi); virtual void writeM17RSSIInt(unsigned char rssi);
virtual void clearM17Int(); virtual void clearM17Int();
virtual void writePOCSAGInt(uint32_t ric, const std::string& message); virtual void writePOCSAGInt(uint32_t ric, const std::string& message);
virtual void clearPOCSAGInt(); virtual void clearPOCSAGInt();
virtual void writeCWInt(); virtual void writeCWInt();
virtual void clearCWInt(); virtual void clearCWInt();
virtual void clockInt(unsigned int ms); virtual void clockInt(unsigned int ms);
private: private:
std::string m_address; std::string m_address;

39
Nextion.cpp
View File

@@ -137,7 +137,7 @@ void CNextion::setIdleInt()
sendCommand("page MMDVM"); sendCommand("page MMDVM");
sendCommandAction(1U); sendCommandAction(1U);
if (m_brightness>0) { if (m_brightness > 0U) {
::sprintf(command, "dim=%u", m_idleBrightness); ::sprintf(command, "dim=%u", m_idleBrightness);
sendCommand(command); sendCommand(command);
} }
@@ -203,7 +203,7 @@ void CNextion::setErrorInt(const char* text)
sendCommandAction(1U); sendCommandAction(1U);
char command[20]; char command[20];
if (m_brightness>0) { if (m_brightness > 0U) {
::sprintf(command, "dim=%u", m_brightness); ::sprintf(command, "dim=%u", m_brightness);
sendCommand(command); sendCommand(command);
} }
@@ -226,7 +226,7 @@ void CNextion::setLockoutInt()
sendCommandAction(1U); sendCommandAction(1U);
char command[20]; char command[20];
if (m_brightness>0) { if (m_brightness > 0U) {
::sprintf(command, "dim=%u", m_brightness); ::sprintf(command, "dim=%u", m_brightness);
sendCommand(command); sendCommand(command);
} }
@@ -245,7 +245,7 @@ void CNextion::setQuitInt()
sendCommandAction(1U); sendCommandAction(1U);
char command[100]; char command[100];
if (m_brightness>0) { if (m_brightness > 0U) {
::sprintf(command, "dim=%u", m_idleBrightness); ::sprintf(command, "dim=%u", m_idleBrightness);
sendCommand(command); sendCommand(command);
} }
@@ -268,7 +268,7 @@ void CNextion::setFMInt()
sendCommandAction(1U); sendCommandAction(1U);
char command[20]; char command[20];
if (m_brightness > 0) { if (m_brightness > 0U) {
::sprintf(command, "dim=%u", m_brightness); ::sprintf(command, "dim=%u", m_brightness);
sendCommand(command); sendCommand(command);
} }
@@ -295,7 +295,7 @@ void CNextion::writeDStarInt(const char* my1, const char* my2, const char* your,
} }
char text[50U]; char text[50U];
if (m_brightness>0) { if (m_brightness > 0U) {
::sprintf(text, "dim=%u", m_brightness); ::sprintf(text, "dim=%u", m_brightness);
sendCommand(text); sendCommand(text);
} }
@@ -396,7 +396,7 @@ void CNextion::writeDMRInt(unsigned int slotNo, const std::string& src, bool gro
} }
char text[50U]; char text[50U];
if (m_brightness>0) { if (m_brightness > 0U) {
::sprintf(text, "dim=%u", m_brightness); ::sprintf(text, "dim=%u", m_brightness);
sendCommand(text); sendCommand(text);
} }
@@ -614,7 +614,7 @@ void CNextion::writeFusionInt(const char* source, const char* dest, unsigned cha
char text[30U]; char text[30U];
if (m_brightness>0) { if (m_brightness > 0U) {
::sprintf(text, "dim=%u", m_brightness); ::sprintf(text, "dim=%u", m_brightness);
sendCommand(text); sendCommand(text);
} }
@@ -693,7 +693,7 @@ void CNextion::writeP25Int(const char* source, bool group, unsigned int dest, co
} }
char text[30U]; char text[30U];
if (m_brightness>0) { if (m_brightness > 0U) {
::sprintf(text, "dim=%u", m_brightness); ::sprintf(text, "dim=%u", m_brightness);
sendCommand(text); sendCommand(text);
} }
@@ -765,7 +765,7 @@ void CNextion::writeNXDNInt(const char* source, bool group, unsigned int dest, c
} }
char text[30U]; char text[30U];
if (m_brightness>0) { if (m_brightness > 0U) {
::sprintf(text, "dim=%u", m_brightness); ::sprintf(text, "dim=%u", m_brightness);
sendCommand(text); sendCommand(text);
} }
@@ -838,7 +838,7 @@ void CNextion::writeM17Int(const char* source, const char* dest, const char* typ
} }
char text[30U]; char text[30U];
if (m_brightness > 0) { if (m_brightness > 0U) {
::sprintf(text, "dim=%u", m_brightness); ::sprintf(text, "dim=%u", m_brightness);
sendCommand(text); sendCommand(text);
} }
@@ -907,7 +907,7 @@ void CNextion::writePOCSAGInt(uint32_t ric, const std::string& message)
} }
char text[200U]; char text[200U];
if (m_brightness>0) { if (m_brightness > 0U) {
::sprintf(text, "dim=%u", m_brightness); ::sprintf(text, "dim=%u", m_brightness);
sendCommand(text); sendCommand(text);
} }
@@ -978,13 +978,14 @@ void CNextion::close()
void CNextion::sendCommandAction(unsigned int status) void CNextion::sendCommandAction(unsigned int status)
{ {
if (!(m_screenLayout & LAYOUT_DIY)) if (!(m_screenLayout & LAYOUT_DIY))
return; return;
char text[30U]; char text[30U];
::sprintf(text, "MMDVM.status.val=%d", status); ::sprintf(text, "MMDVM.status.val=%d", status);
sendCommand(text); sendCommand(text);
sendCommand("click S0,1");
sendCommand("click S0,1");
} }
void CNextion::sendCommand(const char* command) void CNextion::sendCommand(const char* command)
@@ -993,8 +994,10 @@ void CNextion::sendCommand(const char* command)
m_serial->write((unsigned char*)command, (unsigned int)::strlen(command)); m_serial->write((unsigned char*)command, (unsigned int)::strlen(command));
m_serial->write((unsigned char*)"\xFF\xFF\xFF", 3U); m_serial->write((unsigned char*)"\xFF\xFF\xFF", 3U);
// Since we just firing commands at the display, and not listening for the response, // Since we just firing commands at the display, and not listening for the response,
// we must add a bit of a delay to allow the display to process the commands, else some are getting mangled. // we must add a bit of a delay to allow the display to process the commands, else some are getting mangled.
// 10 ms is just a guess, but seems to be sufficient. // 10 ms is just a guess, but seems to be sufficient.
CThread::sleep(10U); CThread::sleep(10U);
} }

132
Nextion.h
View File

@@ -29,87 +29,87 @@
class CNextion : public CDisplay class CNextion : public CDisplay
{ {
public: public:
CNextion(const std::string& callsign, unsigned int dmrid, ISerialPort* serial, unsigned int brightness, bool displayClock, bool utc, unsigned int idleBrightness, unsigned int screenLayout, unsigned int txFrequency, unsigned int rxFrequency, bool displayTempInF); CNextion(const std::string& callsign, unsigned int dmrid, ISerialPort* serial, unsigned int brightness, bool displayClock, bool utc, unsigned int idleBrightness, unsigned int screenLayout, unsigned int txFrequency, unsigned int rxFrequency, bool displayTempInF);
virtual ~CNextion(); virtual ~CNextion();
virtual bool open(); virtual bool open();
virtual void close(); virtual void close();
protected: protected:
virtual void setIdleInt(); virtual void setIdleInt();
virtual void setErrorInt(const char* text); virtual void setErrorInt(const char* text);
virtual void setLockoutInt(); virtual void setLockoutInt();
virtual void setQuitInt(); virtual void setQuitInt();
virtual void setFMInt(); virtual void setFMInt();
virtual void writeDStarInt(const char* my1, const char* my2, const char* your, const char* type, const char* reflector); virtual void writeDStarInt(const char* my1, const char* my2, const char* your, const char* type, const char* reflector);
virtual void writeDStarRSSIInt(unsigned char rssi); virtual void writeDStarRSSIInt(unsigned char rssi);
virtual void writeDStarBERInt(float ber); virtual void writeDStarBERInt(float ber);
virtual void clearDStarInt(); virtual void clearDStarInt();
virtual void writeDMRInt(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type); virtual void writeDMRInt(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type);
virtual void writeDMRRSSIInt(unsigned int slotNo, unsigned char rssi); virtual void writeDMRRSSIInt(unsigned int slotNo, unsigned char rssi);
virtual void writeDMRTAInt(unsigned int slotNo, const unsigned char* talkerAlias, const char* type); virtual void writeDMRTAInt(unsigned int slotNo, const unsigned char* talkerAlias, const char* type);
virtual void writeDMRBERInt(unsigned int slotNo, float ber); virtual void writeDMRBERInt(unsigned int slotNo, float ber);
virtual void clearDMRInt(unsigned int slotNo); virtual void clearDMRInt(unsigned int slotNo);
virtual void writeFusionInt(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin); virtual void writeFusionInt(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin);
virtual void writeFusionRSSIInt(unsigned char rssi); virtual void writeFusionRSSIInt(unsigned char rssi);
virtual void writeFusionBERInt(float ber); virtual void writeFusionBERInt(float ber);
virtual void clearFusionInt(); virtual void clearFusionInt();
virtual void writeP25Int(const char* source, bool group, unsigned int dest, const char* type); virtual void writeP25Int(const char* source, bool group, unsigned int dest, const char* type);
virtual void writeP25RSSIInt(unsigned char rssi); virtual void writeP25RSSIInt(unsigned char rssi);
virtual void writeP25BERInt(float ber); virtual void writeP25BERInt(float ber);
virtual void clearP25Int(); virtual void clearP25Int();
virtual void writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type); virtual void writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type);
virtual void writeNXDNRSSIInt(unsigned char rssi); virtual void writeNXDNRSSIInt(unsigned char rssi);
virtual void writeNXDNBERInt(float ber); virtual void writeNXDNBERInt(float ber);
virtual void clearNXDNInt(); virtual void clearNXDNInt();
virtual void writeM17Int(const char* source, const char* dest, const char* type); virtual void writeM17Int(const char* source, const char* dest, const char* type);
virtual void writeM17RSSIInt(unsigned char rssi); virtual void writeM17RSSIInt(unsigned char rssi);
virtual void writeM17BERInt(float ber); virtual void writeM17BERInt(float ber);
virtual void clearM17Int(); virtual void clearM17Int();
virtual void writePOCSAGInt(uint32_t ric, const std::string& message); virtual void writePOCSAGInt(uint32_t ric, const std::string& message);
virtual void clearPOCSAGInt(); virtual void clearPOCSAGInt();
virtual void writeCWInt(); virtual void writeCWInt();
virtual void clearCWInt(); virtual void clearCWInt();
virtual void clockInt(unsigned int ms); virtual void clockInt(unsigned int ms);
private: private:
std::string m_callsign; std::string m_callsign;
std::string m_ipaddress; std::string m_ipaddress;
unsigned int m_dmrid; unsigned int m_dmrid;
ISerialPort* m_serial; ISerialPort* m_serial;
unsigned int m_brightness; unsigned int m_brightness;
unsigned char m_mode; unsigned char m_mode;
bool m_displayClock; bool m_displayClock;
bool m_utc; bool m_utc;
unsigned int m_idleBrightness; unsigned int m_idleBrightness;
unsigned int m_screenLayout; unsigned int m_screenLayout;
CTimer m_clockDisplayTimer; CTimer m_clockDisplayTimer;
unsigned int m_rssiAccum1; unsigned int m_rssiAccum1;
unsigned int m_rssiAccum2; unsigned int m_rssiAccum2;
float m_berAccum1; float m_berAccum1;
float m_berAccum2; float m_berAccum2;
unsigned int m_rssiCount1; unsigned int m_rssiCount1;
unsigned int m_rssiCount2; unsigned int m_rssiCount2;
unsigned int m_berCount1; unsigned int m_berCount1;
unsigned int m_berCount2; unsigned int m_berCount2;
unsigned int m_txFrequency; unsigned int m_txFrequency;
unsigned int m_rxFrequency; unsigned int m_rxFrequency;
double m_fl_txFrequency; double m_fl_txFrequency;
double m_fl_rxFrequency; double m_fl_rxFrequency;
bool m_displayTempInF; bool m_displayTempInF;
void sendCommand(const char* command); void sendCommand(const char* command);
void sendCommandAction(unsigned int status); void sendCommandAction(unsigned int status);
}; };
#endif #endif

10
NullDisplay.h
View File

@@ -26,19 +26,19 @@
class CNullDisplay : public CDisplay class CNullDisplay : public CDisplay
{ {
public: public:
CNullDisplay(); CNullDisplay();
virtual ~CNullDisplay(); virtual ~CNullDisplay();
virtual bool open(); virtual bool open();
virtual void close(); virtual void close();
protected: protected:
virtual void setIdleInt(); virtual void setIdleInt();
virtual void setErrorInt(const char* text); virtual void setErrorInt(const char* text);
virtual void setLockoutInt(); virtual void setLockoutInt();
virtual void setQuitInt(); virtual void setQuitInt();
virtual void setFMInt(); virtual void setFMInt();
virtual void writeDStarInt(const char* my1, const char* my2, const char* your, const char* type, const char* reflector); virtual void writeDStarInt(const char* my1, const char* my2, const char* your, const char* type, const char* reflector);
virtual void clearDStarInt(); virtual void clearDStarInt();

877
OLED.cpp
View File

File diff suppressed because it is too large Load Diff

87
OLED.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2016,2017,2018,2020 by Jonathan Naylor G4KLX * Copyright (C) 2016,2017,2018,2020,2023 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -45,63 +45,64 @@
class COLED : public CDisplay class COLED : public CDisplay
{ {
public: public:
COLED(unsigned char displayType, unsigned char displayBrighness, bool displayInvert, bool displayScroll, bool displayRotate, bool displayLogoScreensaver, bool duplex); COLED(char displayType, unsigned char displayBrighness, bool displayInvert, bool displayScroll, bool displayRotate, bool displayLogoScreensaver, bool duplex);
virtual ~COLED(); virtual ~COLED();
virtual bool open(); virtual bool open();
virtual void setIdleInt(); virtual void close();
virtual void setErrorInt(const char* text); protected:
virtual void setLockoutInt(); virtual void setIdleInt();
virtual void setQuitInt(); virtual void setErrorInt(const char* text);
virtual void setFMInt(); virtual void setLockoutInt();
virtual void setQuitInt();
virtual void setFMInt();
virtual void writeDStarInt(const char* my1, const char* my2, const char* your, const char* type, const char* reflector); virtual void writeDStarInt(const char* my1, const char* my2, const char* your, const char* type, const char* reflector);
virtual void clearDStarInt(); virtual void clearDStarInt();
virtual void writeDMRInt(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type); virtual void writeDMRInt(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type);
virtual int writeDMRIntEx(unsigned int slotNo, const class CUserDBentry& src, bool group, const std::string& dst, const char* type); virtual int writeDMRIntEx(unsigned int slotNo, const CUserDBentry& src, bool group, const std::string& dst, const char* type);
virtual void clearDMRInt(unsigned int slotNo); virtual void clearDMRInt(unsigned int slotNo);
virtual void writeFusionInt(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin); virtual void writeFusionInt(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin);
virtual void clearFusionInt(); virtual void clearFusionInt();
virtual void writeP25Int(const char* source, bool group, unsigned int dest, const char* type); virtual void writeP25Int(const char* source, bool group, unsigned int dest, const char* type);
virtual void clearP25Int(); virtual void clearP25Int();
virtual void writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type); virtual void writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type);
virtual int writeNXDNIntEx(const class CUserDBentry& source, bool group, unsigned int dest, const char* type); virtual int writeNXDNIntEx(const CUserDBentry& source, bool group, unsigned int dest, const char* type);
virtual void clearNXDNInt(); virtual void clearNXDNInt();
virtual void writeM17Int(const char* source, const char* dest, const char* type); virtual void writeM17Int(const char* source, const char* dest, const char* type);
virtual void clearM17Int(); virtual void clearM17Int();
virtual void writePOCSAGInt(uint32_t ric, const std::string& message); virtual void writePOCSAGInt(uint32_t ric, const std::string& message);
virtual void clearPOCSAGInt(); virtual void clearPOCSAGInt();
virtual void writeCWInt(); virtual void writeCWInt();
virtual void clearCWInt(); virtual void clearCWInt();
virtual void close();
private: private:
const char* m_slot1_state; const char* m_slot1_state;
const char* m_slot2_state; const char* m_slot2_state;
unsigned char m_mode; unsigned char m_mode;
unsigned char m_displayType; unsigned char m_displayType;
unsigned char m_displayBrightness; unsigned char m_displayBrightness;
bool m_displayInvert; bool m_displayInvert;
bool m_displayScroll; bool m_displayScroll;
bool m_displayRotate; bool m_displayRotate;
bool m_displayLogoScreensaver; bool m_displayLogoScreensaver;
bool m_duplex; bool m_duplex;
std::string m_ipaddress; std::string m_ipaddress;
ArduiPi_OLED m_display; ArduiPi_OLED m_display;
float readTemperature(const std::string& filePath); float readTemperature(const char* filePath);
void OLED_statusbar(); void OLED_statusbar();
}; };
#endif #endif

4
TFTSurenoo.cpp
View File

@@ -235,7 +235,7 @@ void CTFTSurenoo::writeDMRInt(unsigned int slotNo, const std::string& src, bool
m_mode = MODE_DMR; m_mode = MODE_DMR;
} }
int CTFTSurenoo::writeDMRIntEx(unsigned int slotNo, const class CUserDBentry& src, bool group, const std::string& dst, const char* type) int CTFTSurenoo::writeDMRIntEx(unsigned int slotNo, const CUserDBentry& src, bool group, const std::string& dst, const char* type)
{ {
assert(type != NULL); assert(type != NULL);
@@ -335,7 +335,7 @@ void CTFTSurenoo::writeNXDNInt(const char* source, bool group, unsigned int dest
m_mode = MODE_NXDN; m_mode = MODE_NXDN;
} }
int CTFTSurenoo::writeNXDNIntEx(const class CUserDBentry& source, bool group, unsigned int dest, const char* type) int CTFTSurenoo::writeNXDNIntEx(const CUserDBentry& source, bool group, unsigned int dest, const char* type)
{ {
assert(type != NULL); assert(type != NULL);

52
TFTSurenoo.h
View File

@@ -30,25 +30,25 @@
class CTFTSurenoo : public CDisplay class CTFTSurenoo : public CDisplay
{ {
public: public:
CTFTSurenoo(const std::string& callsign, unsigned int dmrid, ISerialPort* serial, unsigned int brightness, bool duplex); CTFTSurenoo(const std::string& callsign, unsigned int dmrid, ISerialPort* serial, unsigned int brightness, bool duplex);
virtual ~CTFTSurenoo(); virtual ~CTFTSurenoo();
virtual bool open(); virtual bool open();
virtual void close(); virtual void close();
protected: protected:
virtual void setIdleInt(); virtual void setIdleInt();
virtual void setErrorInt(const char* text); virtual void setErrorInt(const char* text);
virtual void setLockoutInt(); virtual void setLockoutInt();
virtual void setQuitInt(); virtual void setQuitInt();
virtual void setFMInt(); virtual void setFMInt();
virtual void writeDStarInt(const char* my1, const char* my2, const char* your, const char* type, const char* reflector); virtual void writeDStarInt(const char* my1, const char* my2, const char* your, const char* type, const char* reflector);
virtual void clearDStarInt(); virtual void clearDStarInt();
virtual void writeDMRInt(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type); virtual void writeDMRInt(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type);
virtual int writeDMRIntEx(unsigned int slotNo, const class CUserDBentry& src, bool group, const std::string& dst, const char* type); virtual int writeDMRIntEx(unsigned int slotNo, const CUserDBentry& src, bool group, const std::string& dst, const char* type);
virtual void clearDMRInt(unsigned int slotNo); virtual void clearDMRInt(unsigned int slotNo);
virtual void writeFusionInt(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin); virtual void writeFusionInt(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin);
@@ -58,7 +58,7 @@ protected:
virtual void clearP25Int(); virtual void clearP25Int();
virtual void writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type); virtual void writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type);
virtual int writeNXDNIntEx(const class CUserDBentry& source, bool group, unsigned int dest, const char* type); virtual int writeNXDNIntEx(const CUserDBentry& source, bool group, unsigned int dest, const char* type);
virtual void clearNXDNInt(); virtual void clearNXDNInt();
virtual void writeM17Int(const char* source, const char* dest, const char* type); virtual void writeM17Int(const char* source, const char* dest, const char* type);
@@ -73,27 +73,27 @@ protected:
virtual void clockInt(unsigned int ms); virtual void clockInt(unsigned int ms);
private: private:
std::string m_callsign; std::string m_callsign;
unsigned int m_dmrid; unsigned int m_dmrid;
ISerialPort* m_serial; ISerialPort* m_serial;
unsigned int m_brightness; unsigned int m_brightness;
unsigned char m_mode; unsigned char m_mode;
bool m_duplex; bool m_duplex;
bool m_refresh; bool m_refresh;
CTimer m_refreshTimer; CTimer m_refreshTimer;
char* m_lineBuf; char* m_lineBuf;
char m_temp[128]; char m_temp[128];
void setLineBuffer(char *buf, const char *text, int maxchar); void setLineBuffer(char *buf, const char *text, int maxchar);
void setModeLine(const char *text); void setModeLine(const char *text);
void setStatusLine(unsigned int line, const char *text); void setStatusLine(unsigned int line, const char *text);
void refreshDisplay(void); void refreshDisplay();
void lcdReset(void); void lcdReset();
void clearScreen(unsigned char colour); void clearScreen(unsigned char colour);
void setBackground(unsigned char colour); void setBackground(unsigned char colour);
void setRotation(unsigned char rotation); void setRotation(unsigned char rotation);
void setBrightness(unsigned char brightness); void setBrightness(unsigned char brightness);
}; };
#endif #endif