Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #103 from phl0/germandate

Browse source 
Use a dot as date separator optionally
This commit is contained in:
Jonathan Naylor 2016-06-22 12:35:55 +01:00 committed by GitHub
parent 768e3efcad 3f4f4d340d
commit 18fa0df5d3
8 changed files with 51 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Conf.cpp
View file

@ -135,10 +135,12 @@ m_hd44780PWMBright(),
m_hd44780PWMDim(), m_hd44780PWMDim(),
m_hd44780DisplayClock(false), m_hd44780DisplayClock(false),
m_hd44780UTC(false), m_hd44780UTC(false),
m_hd44780DateFormat("English"),
m_nextionPort("/dev/ttyAMA0"), m_nextionPort("/dev/ttyAMA0"),
m_nextionBrightness(50U), m_nextionBrightness(50U),
m_nextionDisplayClock(false), m_nextionDisplayClock(false),
m_nextionUTC(false), m_nextionUTC(false),
m_nextionDateFormat("English"),
m_oledType(3), m_oledType(3),
m_oledBrightness(0), m_oledBrightness(0),
m_oledInvert(0) m_oledInvert(0)
@ -444,6 +446,8 @@ bool CConf::read()
m_hd44780DisplayClock = ::atoi(value) == 1; m_hd44780DisplayClock = ::atoi(value) == 1;
else if (::strcmp(key, "UTC") == 0) else if (::strcmp(key, "UTC") == 0)
m_hd44780UTC = ::atoi(value) == 1; m_hd44780UTC = ::atoi(value) == 1;
else if (::strcmp(key, "DateFormat") == 0)
m_hd44780DateFormat = value;
else if (::strcmp(key, "Pins") == 0) { else if (::strcmp(key, "Pins") == 0) {
char* p = ::strtok(value, ",\r\n"); char* p = ::strtok(value, ",\r\n");
while (p != NULL) { while (p != NULL) {
@ -461,6 +465,8 @@ bool CConf::read()
m_nextionDisplayClock = ::atoi(value) == 1; m_nextionDisplayClock = ::atoi(value) == 1;
else if (::strcmp(key, "UTC") == 0) else if (::strcmp(key, "UTC") == 0)
m_nextionUTC = ::atoi(value) == 1; m_nextionUTC = ::atoi(value) == 1;
else if (::strcmp(key, "DateFormat") == 0)
m_nextionDateFormat = value;
} else if (section == SECTION_OLED) { } else if (section == SECTION_OLED) {
if (::strcmp(key, "Type") == 0) if (::strcmp(key, "Type") == 0)
m_oledType = (unsigned char)::atoi(value); m_oledType = (unsigned char)::atoi(value);
@ -906,6 +912,11 @@ bool CConf::getHD44780UTC() const
return m_hd44780UTC; return m_hd44780UTC;
} }
std::string CConf::getHD44780DateFormat() const
{
return m_hd44780DateFormat;
}
std::string CConf::getNextionPort() const std::string CConf::getNextionPort() const
{ {
return m_nextionPort; return m_nextionPort;
@ -926,6 +937,11 @@ bool CConf::getNextionUTC() const
return m_nextionUTC; return m_nextionUTC;
} }
std::string CConf::getNextionDateFormat() const
{
return m_nextionDateFormat;
}
unsigned char CConf::getOLEDType() const unsigned char CConf::getOLEDType() const
{ {
return m_oledType; return m_oledType;

4
Conf.h
View file

@ -142,12 +142,14 @@ public:
unsigned int getHD44780PWMDim() const; unsigned int getHD44780PWMDim() const;
bool getHD44780DisplayClock() const; bool getHD44780DisplayClock() const;
bool getHD44780UTC() const; bool getHD44780UTC() const;
std::string getHD44780DateFormat() const;
// The Nextion section // The Nextion section
std::string getNextionPort() const; std::string getNextionPort() const;
unsigned int getNextionBrightness() const; unsigned int getNextionBrightness() const;
bool getNextionDisplayClock() const; bool getNextionDisplayClock() const;
bool getNextionUTC() const; bool getNextionUTC() const;
std::string getNextionDateFormat() const;
// The OLED section // The OLED section
unsigned char getOLEDType() const; unsigned char getOLEDType() const;
@ -255,11 +257,13 @@ private:
unsigned int m_hd44780PWMDim; unsigned int m_hd44780PWMDim;
bool m_hd44780DisplayClock; bool m_hd44780DisplayClock;
bool m_hd44780UTC; bool m_hd44780UTC;
std::string m_hd44780DateFormat;
std::string m_nextionPort; std::string m_nextionPort;
unsigned int m_nextionBrightness; unsigned int m_nextionBrightness;
bool m_nextionDisplayClock; bool m_nextionDisplayClock;
bool m_nextionUTC; bool m_nextionUTC;
std::string m_nextionDateFormat;
unsigned char m_oledType; unsigned char m_oledType;
unsigned char m_oledBrightness; unsigned char m_oledBrightness;

9
HD44780.cpp
View file

@ -36,7 +36,7 @@ char m_buffer2[128U];
char m_buffer3[128U]; char m_buffer3[128U];
char m_buffer4[128U]; char m_buffer4[128U];
CHD44780::CHD44780(unsigned int rows, unsigned int cols, const std::string& callsign, unsigned int dmrid, const std::vector<unsigned int>& pins, bool pwm, unsigned int pwmPin, unsigned int pwmBright, unsigned int pwmDim, bool displayClock, bool utc, bool duplex) : CHD44780::CHD44780(unsigned int rows, unsigned int cols, const std::string& callsign, unsigned int dmrid, const std::vector<unsigned int>& pins, bool pwm, unsigned int pwmPin, unsigned int pwmBright, unsigned int pwmDim, bool displayClock, bool utc, bool duplex, const std::string& dateformat) :
CDisplay(), CDisplay(),
m_rows(rows), m_rows(rows),
m_cols(cols), m_cols(cols),
@ -56,6 +56,7 @@ m_displayClock(displayClock),
m_utc(utc), m_utc(utc),
m_duplex(duplex), m_duplex(duplex),
//m_duplex(true), // uncomment to force duplex display for testing! //m_duplex(true), // uncomment to force duplex display for testing!
m_dateformat(dateformat),
m_fd(-1), m_fd(-1),
m_dmr(false), m_dmr(false),
m_clockDisplayTimer(1000U, 0U, 75U), // Update the clock display every 75ms m_clockDisplayTimer(1000U, 0U, 75U), // Update the clock display every 75ms
@ -734,7 +735,11 @@ void CHD44780::clockInt(unsigned int ms)
if (m_cols != 16U && m_rows != 2U) { if (m_cols != 16U && m_rows != 2U) {
::lcdPosition(m_fd, (m_cols - 8) / 2, m_rows == 2 ? 0 : 1); ::lcdPosition(m_fd, (m_cols - 8) / 2, m_rows == 2 ? 0 : 1);
::lcdPrintf(m_fd, "%02d/%02d/%2d", Day, Month, Year%100); if (strcmp(m_dateformat.c_str(), "English") == 0) {
::lcdPrintf(m_fd, "%02d/%02d/%2d", Day, Month, Year%100);
} else if (strcmp(m_dateformat.c_str(), "German") == 0) {
::lcdPrintf(m_fd, "%02d.%02d.%2d", Day, Month, Year%100);
}
} }
m_clockDisplayTimer.start(); m_clockDisplayTimer.start();
} }

3
HD44780.h
View file

@ -53,7 +53,7 @@ enum ADAFRUIT_COLOUR {
class CHD44780 : public CDisplay class CHD44780 : public CDisplay
{ {
public: public:
CHD44780(unsigned int rows, unsigned int cols, const std::string& callsign, unsigned int dmrid, const std::vector<unsigned int>& pins, bool pwm, unsigned int pwmPin, unsigned int pwmBright, unsigned int pwmDim, bool displayClock, bool utc, bool duplex); CHD44780(unsigned int rows, unsigned int cols, const std::string& callsign, unsigned int dmrid, const std::vector<unsigned int>& pins, bool pwm, unsigned int pwmPin, unsigned int pwmBright, unsigned int pwmDim, bool displayClock, bool utc, bool duplex, const std::string& dateformat);
virtual ~CHD44780(); virtual ~CHD44780();
virtual bool open(); virtual bool open();
@ -94,6 +94,7 @@ private:
bool m_displayClock; bool m_displayClock;
bool m_utc; bool m_utc;
bool m_duplex; bool m_duplex;
std::string m_dateformat;
int m_fd; int m_fd;
bool m_dmr; bool m_dmr;
CTimer m_clockDisplayTimer; CTimer m_clockDisplayTimer;

1
MMDVM.ini
View file

@ -124,6 +124,7 @@ Port=/dev/ttyAMA0
Brightness=50 Brightness=50
DisplayClock=1 DisplayClock=1
UTC=0 UTC=0
DateFormat=English
[OLED] [OLED]
Type=3 Type=3

22
MMDVMHost.cpp
View file

@ -833,6 +833,7 @@ void CMMDVMHost::createDisplay()
unsigned int brightness = m_conf.getNextionBrightness(); unsigned int brightness = m_conf.getNextionBrightness();
bool displayClock = m_conf.getNextionDisplayClock(); bool displayClock = m_conf.getNextionDisplayClock();
bool utc = m_conf.getNextionUTC(); bool utc = m_conf.getNextionUTC();
std::string dateformat = m_conf.getNextionDateFormat();
LogInfo(" Port: %s", port.c_str()); LogInfo(" Port: %s", port.c_str());
LogInfo(" Brightness: %u", brightness); LogInfo(" Brightness: %u", brightness);
@ -840,18 +841,19 @@ void CMMDVMHost::createDisplay()
if (displayClock) if (displayClock)
LogInfo(" Display UTC: %s", utc ? "yes" : "no"); LogInfo(" Display UTC: %s", utc ? "yes" : "no");
m_display = new CNextion(m_callsign, dmrid, port, brightness, displayClock, utc); m_display = new CNextion(m_callsign, dmrid, port, brightness, displayClock, utc, dateformat);
#if defined(HD44780) #if defined(HD44780)
} else if (type == "HD44780") { } else if (type == "HD44780") {
unsigned int rows = m_conf.getHD44780Rows(); unsigned int rows = m_conf.getHD44780Rows();
unsigned int columns = m_conf.getHD44780Columns(); unsigned int columns = m_conf.getHD44780Columns();
std::vector<unsigned int> pins = m_conf.getHD44780Pins(); std::vector<unsigned int> pins = m_conf.getHD44780Pins();
bool pwm = m_conf.getHD44780PWM(); bool pwm = m_conf.getHD44780PWM();
unsigned int pwmPin = m_conf.getHD44780PWMPin(); unsigned int pwmPin = m_conf.getHD44780PWMPin();
unsigned int pwmBright = m_conf.getHD44780PWMBright(); unsigned int pwmBright = m_conf.getHD44780PWMBright();
unsigned int pwmDim = m_conf.getHD44780PWMDim(); unsigned int pwmDim = m_conf.getHD44780PWMDim();
bool displayClock = m_conf.getHD44780DisplayClock(); bool displayClock = m_conf.getHD44780DisplayClock();
bool utc = m_conf.getHD44780UTC(); bool utc = m_conf.getHD44780UTC();
std::string dateformat = m_conf.getHD44780DateFormat();
if (pins.size() == 6U) { if (pins.size() == 6U) {
LogInfo(" Rows: %u", rows); LogInfo(" Rows: %u", rows);
@ -869,7 +871,7 @@ void CMMDVMHost::createDisplay()
if (displayClock) if (displayClock)
LogInfo(" Display UTC: %s", utc ? "yes" : "no"); LogInfo(" Display UTC: %s", utc ? "yes" : "no");
m_display = new CHD44780(rows, columns, m_callsign, dmrid, pins, pwm, pwmPin, pwmBright, pwmDim, displayClock, utc, m_duplex); m_display = new CHD44780(rows, columns, m_callsign, dmrid, pins, pwm, pwmPin, pwmBright, pwmDim, displayClock, utc, m_duplex, dateformat);
} }
#endif #endif
#if defined(OLED) #if defined(OLED)

9
Nextion.cpp
View file

@ -24,7 +24,7 @@
#include <cstring> #include <cstring>
#include <ctime> #include <ctime>
CNextion::CNextion(const std::string& callsign, unsigned int dmrid, const std::string& port, unsigned int brightness, bool displayClock, bool utc) : CNextion::CNextion(const std::string& callsign, unsigned int dmrid, const std::string& port, unsigned int brightness, bool displayClock, bool utc, const std::string& dateformat) :
CDisplay(), CDisplay(),
m_callsign(callsign), m_callsign(callsign),
m_dmrid(dmrid), m_dmrid(dmrid),
@ -33,6 +33,7 @@ m_brightness(brightness),
m_mode(MODE_IDLE), m_mode(MODE_IDLE),
m_displayClock(displayClock), m_displayClock(displayClock),
m_utc(utc), m_utc(utc),
m_dateformat(dateformat),
m_clockDisplayTimer(1000U, 0U, 400U) m_clockDisplayTimer(1000U, 0U, 400U)
{ {
assert(brightness >= 0U && brightness <= 100U); assert(brightness >= 0U && brightness <= 100U);
@ -241,7 +242,11 @@ void CNextion::clockInt(unsigned int ms)
int Sec = Time->tm_sec; int Sec = Time->tm_sec;
char text[50U]; char text[50U];
::sprintf(text, "t2.txt=\"%02d:%02d:%02d %02d/%02d/%2d\"", Hour, Min, Sec, Day, Month, Year % 100); if (strcmp(m_dateformat.c_str(), "English") == 0) {
::sprintf(text, "t2.txt=\"%02d:%02d:%02d %02d/%02d/%2d\"", Hour, Min, Sec, Day, Month, Year % 100);
} else if (strcmp(m_dateformat.c_str(), "German") == 0) {
::sprintf(text, "t2.txt=\"%02d:%02d:%02d %02d.%02d.%2d\"", Hour, Min, Sec, Day, Month, Year % 100);
}
sendCommand(text); sendCommand(text);
m_clockDisplayTimer.start(); // restart the clock display timer m_clockDisplayTimer.start(); // restart the clock display timer

3
Nextion.h
View file

@ -29,7 +29,7 @@
class CNextion : public CDisplay class CNextion : public CDisplay
{ {
public: public:
CNextion(const std::string& callsign, unsigned int dmrid, const std::string& port, unsigned int brightness, bool displayClock, bool utc); CNextion(const std::string& callsign, unsigned int dmrid, const std::string& port, unsigned int brightness, bool displayClock, bool utc, const std::string& dateformat);
virtual ~CNextion(); virtual ~CNextion();
virtual bool open(); virtual bool open();
@ -60,6 +60,7 @@ private:
unsigned char m_mode; unsigned char m_mode;
bool m_displayClock; bool m_displayClock;
bool m_utc; bool m_utc;
std::string m_dateformat;
CTimer m_clockDisplayTimer; CTimer m_clockDisplayTimer;
void sendCommand(const char* command); void sendCommand(const char* command);