From 26fabb2b68945218bc4a39941763f2ee03bb3d9e Mon Sep 17 00:00:00 2001 From: Tony Corbett Date: Sun, 29 May 2016 10:13:43 +0300 Subject: [PATCH] Impliment clock on all HD44780 sizes and redesigned IDLE screen --- HD44780.cpp | 130 +++++++++++++++++++++++++++--------------------- HD44780.layouts | 58 +++++++++++++++++++++ 2 files changed, 130 insertions(+), 58 deletions(-) create mode 100644 HD44780.layouts diff --git a/HD44780.cpp b/HD44780.cpp index 8504eb9..339a3c8 100644 --- a/HD44780.cpp +++ b/HD44780.cpp @@ -31,6 +31,9 @@ const char* LISTENING = "Listening "; const char* DEADSPACE = " "; +char m_buffer1[128U]; +char m_buffer2[128U]; + CHD44780::CHD44780(unsigned int rows, unsigned int cols, const std::string& callsign, unsigned int dmrid, const std::vector& pins, bool pwm, unsigned int pwmPin, unsigned int pwmBright, unsigned int pwmDim, bool displayClock, bool utc, bool duplex) : CDisplay(), m_rows(rows), @@ -304,19 +307,21 @@ void CHD44780::setIdleInt() ::pwmWrite(m_pwmPin, (m_pwmDim / 100) * 1024); } + // Print callsign and ID at on top row for all screen sizes ::lcdPosition(m_fd, 0, 0); ::lcdPrintf(m_fd, "%-6s", m_callsign.c_str()); ::lcdPosition(m_fd, m_cols - 7, 0); ::lcdPrintf(m_fd, "%7u", m_dmrid); - ::lcdPosition(m_fd, 0, 1); + // Print MMDVM and Idle on bottom row for all screen sizes + ::lcdPosition(m_fd, 0, m_rows - 1); ::lcdPutchar(m_fd, 2); ::lcdPutchar(m_fd, 2); ::lcdPutchar(m_fd, 3); ::lcdPutchar(m_fd, 4); ::lcdPutchar(m_fd, 2); - if (!m_displayClock || m_cols > 16) - ::lcdPuts(m_fd, " Idle"); + ::lcdPosition(m_fd, m_cols - 4, m_rows - 1); + ::lcdPuts(m_fd, "Idle"); // Gets overwritten by clock on 2 line screen m_dmr = false; } @@ -407,45 +412,45 @@ void CHD44780::writeDStarInt(const char* my1, const char* my2, const char* your, ::lcdPuts(m_fd, "D-Star"); if (m_rows == 2U && m_cols == 16U) { - char buffer[16U]; - ::sprintf(buffer, "%s %.8s/%.4s", type, my1, my2); +// char buffer[16U]; + ::sprintf(m_buffer1, "%s %.8s/%.4s", type, my1, my2); ::lcdPosition(m_fd, 0, 1); - ::lcdPrintf(m_fd, "%.*s", m_cols, buffer); + ::lcdPrintf(m_fd, "%.*s", m_cols, m_buffer1); } else if (m_rows == 4U && m_cols == 16U) { - char buffer[16U]; - ::sprintf(buffer, "%s %.8s/%.4s", type, my1, my2); +// char buffer[16U]; + ::sprintf(m_buffer1, "%s %.8s/%.4s", type, my1, my2); ::lcdPosition(m_fd, 0, 1); - ::lcdPrintf(m_fd, "%.*s", m_cols, buffer); + ::lcdPrintf(m_fd, "%.*s", m_cols, m_buffer1); if (strcmp(reflector, " ") == 0) - ::sprintf(buffer, "%.8s", your); + ::sprintf(m_buffer1, "%.8s", your); else - ::sprintf(buffer, "%.8s<%.8s", your, reflector); + ::sprintf(m_buffer1, "%.8s<%.8s", your, reflector); ::lcdPosition(m_fd, 0, 2); - ::lcdPrintf(m_fd, "%.*s", m_cols, buffer); + ::lcdPrintf(m_fd, "%.*s", m_cols, m_buffer1); } else if (m_rows == 4U && m_cols == 20U) { - char buffer[20U]; - ::sprintf(buffer, "%s %.8s/%.4s >", type, my1, my2); + char m_buffer1[20U]; + ::sprintf(m_buffer1, "%s %.8s/%.4s >", type, my1, my2); ::lcdPosition(m_fd, 0, 1); - ::lcdPrintf(m_fd, "%.*s", m_cols, buffer); + ::lcdPrintf(m_fd, "%.*s", m_cols, m_buffer1); if (strcmp(reflector, " ") == 0) - ::sprintf(buffer, "%.8s", your); + ::sprintf(m_buffer1, "%.8s", your); else - ::sprintf(buffer, "%.8s <- %.8s", your, reflector); + ::sprintf(m_buffer1, "%.8s <- %.8s", your, reflector); ::lcdPosition(m_fd, 0, 2); - ::lcdPrintf(m_fd, "%.*s", m_cols, buffer); + ::lcdPrintf(m_fd, "%.*s", m_cols, m_buffer1); } else if (m_rows == 2 && m_cols == 40U) { - char buffer[40U]; + char m_buffer1[40U]; if (strcmp(reflector, " ") == 0) - ::sprintf(buffer, "%s %.8s/%.4s > %.8s", type, my1, my2, your); + ::sprintf(m_buffer1, "%s %.8s/%.4s > %.8s", type, my1, my2, your); else - ::sprintf(buffer, "%s %.8s/%.4s > %.8s via %.8s", type, my1, my2, your, reflector); + ::sprintf(m_buffer1, "%s %.8s/%.4s > %.8s via %.8s", type, my1, my2, your, reflector); ::lcdPosition(m_fd, 0, 1); - ::lcdPrintf(m_fd, "%.*s", m_cols, buffer); + ::lcdPrintf(m_fd, "%.*s", m_cols, m_buffer1); } m_dmr = false; @@ -482,7 +487,7 @@ void CHD44780::clearDStarInt() void CHD44780::writeDMRInt(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type) { - char buffer[128]; // force 128 char buffer - we're never getting that far but stops us overflowing it! +// char buffer[128]; // force 128 char buffer - we're never getting that far but stops us overflowing it! assert(type != NULL); if (!m_dmr) { @@ -503,8 +508,8 @@ void CHD44780::writeDMRInt(unsigned int slotNo, const std::string& src, bool gro if (m_duplex) { if (m_rows > 2U) { ::lcdPosition(m_fd, 0, (m_rows / 2) - 2); - ::sprintf(buffer, "%s%s", "DMR", DEADSPACE); - ::lcdPrintf(m_fd, "%.*s", m_cols, buffer); + ::sprintf(m_buffer1, "%s%s", "DMR", DEADSPACE); + ::lcdPrintf(m_fd, "%.*s", m_cols, m_buffer1); } if (slotNo == 1U) { @@ -516,8 +521,8 @@ void CHD44780::writeDMRInt(unsigned int slotNo, const std::string& src, bool gro } } else { ::lcdPosition(m_fd, 0, (m_rows / 2) - 1); - ::sprintf(buffer, "%s%s", "DMR", DEADSPACE); - ::lcdPrintf(m_fd, "%.*s", m_cols, buffer); + ::sprintf(m_buffer1, "%s%s", "DMR", DEADSPACE); + ::lcdPrintf(m_fd, "%.*s", m_cols, m_buffer1); ::lcdPosition(m_fd, 0, (m_rows / 2)); ::lcdPrintf(m_fd, "%.*s", m_cols, LISTENING); } @@ -531,8 +536,8 @@ void CHD44780::writeDMRInt(unsigned int slotNo, const std::string& src, bool gro if (slotNo == 1U) { ::lcdPosition(m_fd, 0, (m_rows / 2) - 1); ::lcdPuts(m_fd, "1 "); - ::sprintf(buffer, "%s > %s%s", src.c_str(), dst.c_str(), DEADSPACE); - ::lcdPrintf(m_fd, "%.*s", m_cols - 2U, buffer); + ::sprintf(m_buffer1, "%s > %s%s", src.c_str(), dst.c_str(), DEADSPACE); + ::lcdPrintf(m_fd, "%.*s", m_cols - 2U, m_buffer1); if (m_cols > 16) { ::lcdCharDef(m_fd, 6, group ? tgChar : privChar); @@ -545,8 +550,8 @@ void CHD44780::writeDMRInt(unsigned int slotNo, const std::string& src, bool gro } else { ::lcdPosition(m_fd, 0, (m_rows / 2)); ::lcdPuts(m_fd, "2 "); - ::sprintf(buffer, "%s > %s%s", src.c_str(), dst.c_str(), DEADSPACE); - ::lcdPrintf(m_fd, "%.*s", m_cols - 2U, buffer); + ::sprintf(m_buffer2, "%s > %s%s", src.c_str(), dst.c_str(), DEADSPACE); + ::lcdPrintf(m_fd, "%.*s", m_cols - 2U, m_buffer2); if (m_cols > 16) { ::lcdCharDef(m_fd, 6, group ? tgChar : privChar); @@ -560,16 +565,16 @@ void CHD44780::writeDMRInt(unsigned int slotNo, const std::string& src, bool gro } else { ::lcdPosition(m_fd, 0, (m_rows / 2) - 1); ::lcdPutchar(m_fd, 0); - ::sprintf(buffer, " %s%s", src.c_str(), DEADSPACE); - ::lcdPrintf(m_fd, "%.*s", m_cols - 4U, buffer); + ::sprintf(m_buffer2, " %s%s", src.c_str(), DEADSPACE); + ::lcdPrintf(m_fd, "%.*s", m_cols - 4U, m_buffer2); ::lcdCharDef(m_fd, 5, strcmp(type, "R") == 0 ? rfChar : ipChar); ::lcdPosition(m_fd, m_cols - 1U, (m_rows / 2) - 1); ::lcdPutchar(m_fd, 5); ::lcdPosition(m_fd, 0, (m_rows / 2)); ::lcdPutchar(m_fd, 1); - ::sprintf(buffer, " %s%s", dst.c_str(), DEADSPACE); - ::lcdPrintf(m_fd, "%.*s", m_cols - 4U, buffer); + ::sprintf(m_buffer2, " %s%s", dst.c_str(), DEADSPACE); + ::lcdPrintf(m_fd, "%.*s", m_cols - 4U, m_buffer2); ::lcdCharDef(m_fd, 6, group ? tgChar : privChar); ::lcdPosition(m_fd, m_cols - 1U, (m_rows / 2)); ::lcdPutchar(m_fd, 6); @@ -579,7 +584,7 @@ void CHD44780::writeDMRInt(unsigned int slotNo, const std::string& src, bool gro void CHD44780::clearDMRInt(unsigned int slotNo) { - char buffer[128]; // force 128 char buffer - we're never getting that far but stops us overflowing it! +// char buffer[128]; // force 128 char buffer - we're never getting that far but stops us overflowing it! #ifdef ADAFRUIT_DISPLAY adafruitLCDColour(AC_PURPLE); @@ -596,8 +601,8 @@ void CHD44780::clearDMRInt(unsigned int slotNo) } } else { ::lcdPosition(m_fd, 0, (m_rows / 2) - 1); - ::sprintf(buffer, "%s%s", "DMR", DEADSPACE); - ::lcdPrintf(m_fd, "%.*s", m_cols, buffer); + ::sprintf(m_buffer2, "%s%s", "DMR", DEADSPACE); + ::lcdPrintf(m_fd, "%.*s", m_cols, m_buffer2); ::lcdPosition(m_fd, 0, (m_rows / 2)); ::lcdPrintf(m_fd, "%.*s", m_cols, LISTENING); } @@ -628,34 +633,34 @@ void CHD44780::writeFusionInt(const char* source, const char* dest, const char* ::lcdPuts(m_fd, "System Fusion"); if (m_rows == 2U && m_cols == 16U) { - char buffer[16U]; - ::sprintf(buffer, "%.10s >", source); + char m_buffer1[16U]; + ::sprintf(m_buffer1, "%.10s >", source); ::lcdPosition(m_fd, 0, 1); - ::lcdPrintf(m_fd, "%.*s", m_cols, buffer); + ::lcdPrintf(m_fd, "%.*s", m_cols, m_buffer1); } else if (m_rows == 4U && m_cols == 16U) { - char buffer[16U]; - ::sprintf(buffer, "%.10s >", source); + char m_buffer1[16U]; + ::sprintf(m_buffer1, "%.10s >", source); ::lcdPosition(m_fd, 0, 1); - ::lcdPrintf(m_fd, "%.*s", m_cols, buffer); + ::lcdPrintf(m_fd, "%.*s", m_cols, m_buffer1); - ::sprintf(buffer, "%.10s", dest); + ::sprintf(m_buffer1, "%.10s", dest); ::lcdPosition(m_fd, 0, 2); - ::lcdPrintf(m_fd, "%.*s", m_cols, buffer); + ::lcdPrintf(m_fd, "%.*s", m_cols, m_buffer1); } else if (m_rows == 4U && m_cols == 20U) { - char buffer[20U]; - ::sprintf(buffer, "%.10s >", source); + char m_buffer1[20U]; + ::sprintf(m_buffer1, "%.10s >", source); ::lcdPosition(m_fd, 0, 1); - ::lcdPrintf(m_fd, "%.*s", m_cols, buffer); + ::lcdPrintf(m_fd, "%.*s", m_cols, m_buffer1); - ::sprintf(buffer, "%.10s", dest); + ::sprintf(m_buffer1, "%.10s", dest); ::lcdPosition(m_fd, 0, 2); - ::lcdPrintf(m_fd, "%.*s", m_cols, buffer); + ::lcdPrintf(m_fd, "%.*s", m_cols, m_buffer1); } else if (m_rows == 2 && m_cols == 40U) { - char buffer[40U]; - ::sprintf(buffer, "%.10s > %.10s", source, dest); + char m_buffer1[40U]; + ::sprintf(m_buffer1, "%.10s > %.10s", source, dest); ::lcdPosition(m_fd, 0, 1); - ::lcdPrintf(m_fd, "%.*s", m_cols, buffer); + ::lcdPrintf(m_fd, "%.*s", m_cols, m_buffer1); } m_dmr = false; @@ -705,15 +710,24 @@ void CHD44780::clockInt(unsigned int ms) Time = localtime(¤tTime); } - //int Day = Time->tm_mday; - //int Month = Time->tm_mon + 1; - //int Year = Time->tm_year + 1900; + int Day = Time->tm_mday; + int Month = Time->tm_mon + 1; + int Year = Time->tm_year + 1900; int Hour = Time->tm_hour; int Min = Time->tm_min; int Sec = Time->tm_sec; - ::lcdPosition(m_fd, m_cols - 8, 1); + if (m_cols == 16U && m_rows == 2U) { + ::lcdPosition(m_fd, m_cols - 8, 1); + } else { + ::lcdPosition(m_fd, (m_cols - 8) / 2, m_rows == 2 ? 1 : 2); + } ::lcdPrintf(m_fd, "%02d:%02d:%02d", Hour, Min, Sec); + + if (m_cols != 16U && m_rows != 2U) { + ::lcdPosition(m_fd, (m_cols - 8) / 2, m_rows == 2 ? 0 : 1); + ::lcdPrintf(m_fd, "%02d/%02d/%2d", Day, Month, Year%100); + } m_clockDisplayTimer.start(); // restart the clock display timer } } diff --git a/HD44780.layouts b/HD44780.layouts new file mode 100644 index 0000000..03560cf --- /dev/null +++ b/HD44780.layouts @@ -0,0 +1,58 @@ +IDLE SCREEN LAYOUTS +------------------- + +16 x 2 +------ + + With clock Without clock + ---------- ------------- + + 0 1 0 1 + 0123456789012345 0123456789012345 + +----------------+ +----------------+ +0|AAAAAA NNNNNNN| 0|AAAAAA NNNNNNN| +1|MMDVM HH:MM:SS| 1|MMDVM Idle| + +----------------+ +----------------+ + +40 x 2 +------ + + With clock Without clock + ---------- ------------- + + 0 1 2 3 0 1 2 3 + 0123456789012345678901234567890123456789 0123456789012345678901234567890123456789 + +----------------------------------------+ +----------------------------------------+ +0|AAAAAA DD/MM/YY NNNNNNN| 0|AAAAAA NNNNNNN| +1|MMDVM HH:MM:SS Idle| 1|MMDVM Idle| + +----------------------------------------+ +----------------------------------------+ + +16 x 4 +------ + + With clock Without clock + ---------- ------------- + + 0 1 0 1 + 0123456789012345 0123456789012345 + +----------------+ +----------------+ +0|AAAAAA NNNNNNN| 0|AAAAAA NNNNNNN| +1| DD/MM/YY | 1| | +2| HH:MM:SS | 2| | +3|MMDVM Idle| 3|MMDVM Idle| + +----------------+ +----------------+ + +20 x 4 +------ + + With clock Without clock + ---------- ------------- + + 0 1 0 1 + 01234567890123456479 01234567890123456789 + +--------------------+ +--------------------+ +0|AAAAAA NNNNNNN| 0|AAAAAA NNNNNNN| +1| DD/MM/YY | 1| | +2| HH:MM:SS | 2| | +3|MMDVM Idle| 3|MMDVM Idle| + +--------------------+ +--------------------+