Merge branch 'AX25_FM' into M17_AX25_FM

This commit is contained in:
Jonathan Naylor
2020-11-06 15:43:12 +00:00
59 changed files with 6401 additions and 3612 deletions

View File

@@ -21,13 +21,14 @@
#include "Timer.h"
#include "UserDBentry.h"
#include "Modem.h"
#include <string>
#include <cstdint>
class CConf;
class CModem;
class IModem;
class CUMP;
class CDisplay
@@ -86,7 +87,7 @@ public:
void clock(unsigned int ms);
static CDisplay* createDisplay(const CConf& conf, CUMP* ump, CModem* modem);
static CDisplay* createDisplay(const CConf& conf, CUMP* ump, IModem* modem);
protected:
virtual void setIdleInt() = 0;