Merge branch 'master' into AX25_FM
This commit is contained in:
commit
739550885b
2
OLED.cpp
2
OLED.cpp
|
@ -434,7 +434,7 @@ void COLED::clearDMRInt(unsigned int slotNo)
|
|||
m_display.display();
|
||||
}
|
||||
|
||||
void COLED::writeFusionInt(const char* source, const char* dest, const char* type, const char* origin)
|
||||
void COLED::writeFusionInt(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin)
|
||||
{
|
||||
m_mode = MODE_YSF;
|
||||
|
||||
|
|
2
OLED.h
2
OLED.h
|
@ -58,7 +58,7 @@ public:
|
|||
virtual void writeDMRInt(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type);
|
||||
virtual void clearDMRInt(unsigned int slotNo);
|
||||
|
||||
virtual void writeFusionInt(const char* source, const char* dest, 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 writeP25Int(const char* source, bool group, unsigned int dest, const char* type);
|
||||
|
|
Loading…
Reference in a new issue