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

Clean up the recent HD44780 changes.

Browse source
This commit is contained in:
Jonathan Naylor 2016-05-03 17:59:21 +01:00
parent 52de9f3970
commit 99b71a00b2
5 changed files with 171 additions and 175 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Conf.cpp
View file

@ -105,17 +105,17 @@ m_fusionNetworkEnabled(false),
m_fusionNetworkAddress(),
m_fusionNetworkPort(0U),
m_fusionNetworkDebug(false),
m_tftSerialPort(),
m_tftSerialPort("/dev/ttyAMA0"),
m_tftSerialBrightness(50U),
m_hd44780Rows(2U),
m_hd44780Columns(16U),
m_hd44780Pins(),
m_hd44780PWM(),
m_hd44780PWM(false),
m_hd44780PWMPin(),
m_hd44780PWMBright(),
m_hd44780PWMDim(),
m_nextionSize(),
m_nextionPort(),
m_nextionSize("2.4"),
m_nextionPort("/dev/ttyAMA0"),
m_nextionBrightness(50U)
{
}
@ -344,17 +344,14 @@ bool CConf::read()
m_hd44780Rows = (unsigned int)::atoi(value);
else if (::strcmp(key, "Columns") == 0)
m_hd44780Columns = (unsigned int)::atoi(value);
// WFV
else if (::strcmp(key, "PWM") == 0)
m_hd44780PWM = (unsigned int)::atoi(value);
m_hd44780PWM = ::atoi(value) == 1;
else if (::strcmp(key, "PWMPin") == 0)
m_hd44780PWMPin = (unsigned int)::atoi(value);
else if (::strcmp(key, "PWMBright") == 0)
m_hd44780PWMBright = (unsigned int)::atoi(value);
else if (::strcmp(key, "PWMDim") == 0)
m_hd44780PWMDim = (unsigned int)::atoi(value);
else if (::strcmp(key, "Pins") == 0) {
char* p = ::strtok(value, ",\r\n");
while (p != NULL) {
@ -698,8 +695,7 @@ std::vector<unsigned int> CConf::getHD44780Pins() const
return m_hd44780Pins;
}
// WFV
unsigned int CConf::getHD44780PWM() const
bool CConf::getHD44780PWM() const
{
return m_hd44780PWM;
}

8
Conf.h
View file

@ -117,9 +117,7 @@ public:
unsigned int getHD44780Rows() const;
unsigned int getHD44780Columns() const;
std::vector<unsigned int> getHD44780Pins() const;
// WFV
unsigned int getHD44780PWM() const;
bool getHD44780PWM() const;
unsigned int getHD44780PWMPin() const;
unsigned int getHD44780PWMBright() const;
unsigned int getHD44780PWMDim() const;
@ -206,9 +204,7 @@ private:
unsigned int m_hd44780Rows;
unsigned int m_hd44780Columns;
std::vector<unsigned int> m_hd44780Pins;
//WFV
unsigned int m_hd44780PWM;
bool m_hd44780PWM;
unsigned int m_hd44780PWMPin;
unsigned int m_hd44780PWMBright;
unsigned int m_hd44780PWMDim;

273
HD44780.cpp
View file

@ -29,7 +29,7 @@
const char* LISTENING = "Listening ";
CHD44780::CHD44780(unsigned int rows, unsigned int cols, const std::string& callsign, unsigned int dmrid, const std::vector<unsigned int>& pins, unsigned int PWM, unsigned int PWMPin, unsigned int PWMBright, unsigned int PWMDim) :
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) :
m_rows(rows),
m_cols(cols),
m_callsign(callsign),
@ -40,13 +40,10 @@ m_d0(pins.at(2U)),
m_d1(pins.at(3U)),
m_d2(pins.at(4U)),
m_d3(pins.at(5U)),
// WFV
m_PWM(PWM),
m_PWMPin(PWMPin),
m_PWMBright(PWMBright),
m_PWMDim(PWMDim),
m_pwm(pwm),
m_pwmPin(pwmPin),
m_pwmBright(pwmBright),
m_pwmDim(pwmDim),
m_fd(-1),
m_dmr(false)
{
@ -62,20 +59,18 @@ bool CHD44780::open()
{
::wiringPiSetup();
// WFV
if (m_PWM == 1U) {
if (m_PWMPin != 1U) {
::softPwmCreate(m_PWMPin, 0, 100);
::softPwmWrite(m_PWMPin, m_PWMDim);
}
else {
::pinMode(m_PWMPin, PWM_OUTPUT);
::pwmWrite(m_PWMPin, (m_PWMDim/100)*1024);
if (m_pwm) {
if (m_pwmPin != 1U) {
::softPwmCreate(m_pwmPin, 0, 100);
::softPwmWrite(m_pwmPin, m_pwmDim);
} else {
::pinMode(m_pwmPin, PWM_OUTPUT);
::pwmWrite(m_pwmPin, (m_pwmDim / 100) * 1024);
}
}
#ifdef ADAFRUIT_DISPLAY
adafruitLCDSetup();
adafruitLCDSetup();
#endif
m_fd = ::lcdInit(m_rows, m_cols, 4, m_rb, m_strb, m_d0, m_d1, m_d2, m_d3, 0, 0, 0, 0);
@ -94,76 +89,81 @@ bool CHD44780::open()
#ifdef ADAFRUIT_DISPLAY
void CHD44780::adafruitLCDSetup()
{
// The other control pins are initialised with lcdInit ()
::mcp23017Setup (AF_BASE, MCP23017);
// The other control pins are initialised with lcdInit()
::mcp23017Setup(AF_BASE, MCP23017);
// Backlight LEDs
pinMode (AF_RED, OUTPUT);
pinMode (AF_GREEN, OUTPUT);
pinMode (AF_BLUE, OUTPUT);
::pinMode(AF_RED, OUTPUT);
::pinMode(AF_GREEN, OUTPUT);
::pinMode(AF_BLUE, OUTPUT);
// Control signals
pinMode (AF_RW, OUTPUT);
digitalWrite (AF_RW, LOW);
::pinMode(AF_RW, OUTPUT);
::digitalWrite(AF_RW, LOW);
}
void LCDColor(int color)
void CHD44780::adafruitLCDColour(ADAFRUIT_COLOUR colour)
{
//VERY SIMPLE COLOR FUNCTION
// By Giorgio
//OFF
if (color==0){digitalWrite (AF_RED, HIGH);digitalWrite (AF_GREEN, HIGH);digitalWrite (AF_BLUE, HIGH);} // OFF
//BASIC
if (color==1){digitalWrite (AF_RED, LOW);digitalWrite (AF_GREEN, LOW);digitalWrite (AF_BLUE, LOW);} // WHITE
if (color==2){digitalWrite (AF_RED, LOW);digitalWrite (AF_GREEN, HIGH);digitalWrite (AF_BLUE, HIGH);} // RED
if (color==3){digitalWrite (AF_RED, HIGH);digitalWrite (AF_GREEN, LOW);digitalWrite (AF_BLUE, HIGH);} // GREEN
if (color==4){digitalWrite (AF_RED, HIGH);digitalWrite (AF_GREEN, HIGH);digitalWrite (AF_BLUE, LOW);} // BLUE
//SPECIAL
if (color==5){digitalWrite (AF_RED, LOW);digitalWrite (AF_GREEN, HIGH);digitalWrite (AF_BLUE, LOW);} // PURPLE
if (color==6){digitalWrite (AF_RED, LOW);digitalWrite (AF_GREEN, LOW);digitalWrite (AF_BLUE, HIGH);} // YELLOW
if (color==7){digitalWrite (AF_RED, HIGH);digitalWrite (AF_GREEN, LOW);digitalWrite (AF_BLUE, LOW);} // ICE
// USE WITH:
/*
LCDColor(0); //OFF
LCDColor(1); //WHITE
LCDColor(2); //RED
LCDColor(3); //GREEN
LCDColor(4); //BLUE
LCDColor(5); //PURPLE
LCDColor(6); //YELLOW
LCDColor(7); //ICE
*/
switch (colour) {
case AC_OFF:
::digitalWrite(AF_RED, HIGH);
::digitalWrite(AF_GREEN, HIGH);
::digitalWrite(AF_BLUE, HIGH);
break;
case AC_WHITE:
::digitalWrite(AF_RED, LOW);
::digitalWrite(AF_GREEN, LOW);
::digitalWrite(AF_BLUE, LOW);
break;
case AC_RED:
::digitalWrite(AF_RED, LOW);
::digitalWrite(AF_GREEN, HIGH);
::digitalWrite(AF_BLUE, HIGH);
break;
case AC_GREEN:
::digitalWrite(AF_RED, HIGH);
::digitalWrite(AF_GREEN, LOW);
::digitalWrite(AF_BLUE, HIGH);
break;
case AC_BLUE:
::digitalWrite(AF_RED, HIGH);
::digitalWrite(AF_GREEN, HIGH);
::digitalWrite(AF_BLUE, LOW);
break;
case AC_PURPLE:
::digitalWrite(AF_RED, LOW);
::digitalWrite(AF_GREEN, HIGH);
::digitalWrite(AF_BLUE, LOW);
break;
case AC_YELLOW:
::digitalWrite(AF_RED, LOW);
::digitalWrite(AF_GREEN, LOW);
::digitalWrite(AF_BLUE, HIGH);
break;
case AC_ICE:
::digitalWrite(AF_RED, HIGH);
::digitalWrite(AF_GREEN, LOW);
::digitalWrite(AF_BLUE, LOW);
break;
default:
break;
}
}
#endif
void CHD44780::setIdle()
{
::lcdClear(m_fd);
#ifdef ADAFRUIT_DISPLAY
LCDColor(1); //WHITE
adafruittLCDColour(AC_WHITE);
#endif
// WFV
if (m_PWM == 1U) {
if (m_PWMPin != 1U) {
::softPwmWrite(m_PWMPin, m_PWMDim);
}
else {
::pwmWrite(m_PWMPin, (m_PWMDim/100)*1024);
}
if (m_pwm) {
if (m_pwmPin != 1U)
::softPwmWrite(m_pwmPin, m_pwmDim);
else
::pwmWrite(m_pwmPin, (m_pwmDim / 100) * 1024);
}
::lcdPosition(m_fd, 0, 0);
@ -177,21 +177,19 @@ LCDColor(1); //WHITE
void CHD44780::setError(const char* text)
{
#ifdef ADAFRUIT_DISPLAY
LCDColor(2); //RED
#endif
assert(text != NULL);
#ifdef ADAFRUIT_DISPLAY
adafruitLCDColour(AC_RED);
#endif
::lcdClear(m_fd);
// WFV
if (m_PWM == 1U) {
if (m_PWMPin != 1U) {
::softPwmWrite(m_PWMPin, m_PWMBright);
}
else {
::pwmWrite(m_PWMPin, (m_PWMBright/100)*1024);
}
if (m_pwm) {
if (m_pwmPin != 1U)
::softPwmWrite(m_pwmPin, m_pwmBright);
else
::pwmWrite(m_pwmPin, (m_pwmBright / 100) * 1024);
}
::lcdPosition(m_fd, 0, 0);
@ -206,18 +204,16 @@ LCDColor(2); //RED
void CHD44780::setLockout()
{
#ifdef ADAFRUIT_DISPLAY
LCDColor(2); //RED
adafruitLCDColour(AC_RED);
#endif
::lcdClear(m_fd);
// WFV
if (m_PWM == 1U) {
if (m_PWMPin != 1U) {
::softPwmWrite(m_PWMPin, m_PWMBright);
}
else {
::pwmWrite(m_PWMPin, (m_PWMBright/100)*1024);
}
if (m_pwm) {
if (m_pwmPin != 1U)
::softPwmWrite(m_pwmPin, m_pwmBright);
else
::pwmWrite(m_pwmPin, (m_pwmBright / 100) * 1024);
}
::lcdPosition(m_fd, 0, 0);
@ -237,16 +233,17 @@ void CHD44780::writeDStar(const char* my1, const char* my2, const char* your, co
assert(type != NULL);
assert(reflector != NULL);
#ifdef ADAFRUIT_DISPLAY
adafruitLCDColour(AC_RED);
#endif
::lcdClear(m_fd);
// WFV
if (m_PWM == 1U) {
if (m_PWMPin != 1U) {
::softPwmWrite(m_PWMPin, m_PWMBright);
}
else {
::pwmWrite(m_PWMPin, (m_PWMBright/100)*1024);
}
if (m_pwm) {
if (m_pwmPin != 1U)
::softPwmWrite(m_pwmPin, m_pwmBright);
else
::pwmWrite(m_pwmPin, (m_pwmBright / 100) * 1024);
}
::lcdPosition(m_fd, 0, 0);
@ -263,11 +260,11 @@ void CHD44780::writeDStar(const char* my1, const char* my2, const char* your, co
::lcdPosition(m_fd, 0, 1);
::lcdPrintf(m_fd, "%.*s", m_cols, buffer);
if (strcmp(reflector, " ") == 0) {
if (strcmp(reflector, " ") == 0)
::sprintf(buffer, "%.8s", your);
} else {
else
::sprintf(buffer, "%.8s<%.8s", your, reflector);
}
::lcdPosition(m_fd, 0, 2);
::lcdPrintf(m_fd, "%.*s", m_cols, buffer);
} else if (m_rows == 4U && m_cols == 20U) {
@ -276,20 +273,20 @@ void CHD44780::writeDStar(const char* my1, const char* my2, const char* your, co
::lcdPosition(m_fd, 0, 1);
::lcdPrintf(m_fd, "%.*s", m_cols, buffer);
if (strcmp(reflector, " ") == 0) {
if (strcmp(reflector, " ") == 0)
::sprintf(buffer, "%.8s", your);
} else {
else
::sprintf(buffer, "%.8s <- %.8s", your, reflector);
}
::lcdPosition(m_fd, 0, 2);
::lcdPrintf(m_fd, "%.*s", m_cols, buffer);
} else if (m_rows == 2 && m_cols == 40U) {
char buffer[40U];
if (strcmp(reflector, " ") == 0) {
if (strcmp(reflector, " ") == 0)
::sprintf(buffer, "%s %.8s/%.4s > %.8s", type, my1, my2, your);
} else {
else
::sprintf(buffer, "%s %.8s/%.4s > %.8s via %.8s", type, my1, my2, your, reflector);
}
::lcdPosition(m_fd, 0, 1);
::lcdPrintf(m_fd, "%.*s", m_cols, buffer);
}
@ -299,6 +296,9 @@ void CHD44780::writeDStar(const char* my1, const char* my2, const char* your, co
void CHD44780::clearDStar()
{
#ifdef ADAFRUIT_DISPLAY
adafruitLCDColour(AC_ICE);
#endif
if (m_rows == 2U && m_cols == 16U) {
::lcdPosition(m_fd, 0, 1);
@ -323,23 +323,20 @@ void CHD44780::clearDStar()
void CHD44780::writeDMR(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type)
{
assert(type != NULL);
if (!m_dmr) {
::lcdClear(m_fd);
#ifdef ADAFRUIT_DISPLAY
LCDColor(3); //GREEN
adafruitLCDColour(AC_GREEN);
#endif
// WFV
if (m_PWM == 1U) {
if (m_PWMPin != 1U) {
::softPwmWrite(m_PWMPin, m_PWMBright);
}
else {
::pwmWrite(m_PWMPin, (m_PWMBright/100)*1024);
}
if (m_pwm) {
if (m_pwmPin != 1U)
::softPwmWrite(m_pwmPin, m_pwmBright);
else
::pwmWrite(m_pwmPin, (m_pwmBright / 100) * 1024);
}
if (m_rows == 2U && m_cols == 16U) {
@ -354,6 +351,7 @@ LCDColor(3); //GREEN
} else if (m_rows == 4U && m_cols == 16U) {
::lcdPosition(m_fd, 0, 0);
::lcdPuts(m_fd, "DMR");
if (slotNo == 1U) {
::lcdPosition(m_fd, 0, 2);
::lcdPrintf(m_fd, "2 %.*s", m_cols - 2U, LISTENING);
@ -364,6 +362,7 @@ LCDColor(3); //GREEN
} else if (m_rows == 4U && m_cols == 20U) {
::lcdPosition(m_fd, 0, 0);
::lcdPuts(m_fd, "DMR");
if (slotNo == 1U) {
::lcdPosition(m_fd, 0, 2);
::lcdPrintf(m_fd, "2 %.*s", m_cols - 2U, LISTENING);
@ -383,9 +382,8 @@ LCDColor(3); //GREEN
}
if (m_rows == 2U && m_cols == 16U) {
#ifdef ADAFRUIT_DISPLAY
LCDColor(2); //RED
adafruitLCDColour(AC_RED);
#endif
char buffer[16U];
@ -399,9 +397,8 @@ LCDColor(2); //RED
::lcdPrintf(m_fd, "2 %.*s", m_cols - 2U, buffer);
}
} else if (m_rows == 4U && m_cols == 16U) {
#ifdef ADAFRUIT_DISPLAY
LCDColor(2); //RED
adafruitLCDColour(AC_RED);
#endif
char buffer[16U];
@ -415,9 +412,8 @@ LCDColor(2); //RED
::lcdPrintf(m_fd, "2 %.*s", m_cols - 2U, buffer);
}
} else if (m_rows == 4U && m_cols == 20U) {
#ifdef ADAFRUIT_DISPLAY
LCDColor(2); //RED
adafruitLCDColour(AC_RED);
#endif
char buffer[20U];
@ -431,9 +427,8 @@ LCDColor(2); //RED
::lcdPrintf(m_fd, "2 %.*s", m_cols - 2U, buffer);
}
} else if (m_rows == 2U && m_cols == 40U) {
#ifdef ADAFRUIT_DISPLAY
LCDColor(2); //RED
adafruitLCDColour(AC_RED);
#endif
char buffer[40U];
@ -453,9 +448,8 @@ LCDColor(2); //RED
void CHD44780::clearDMR(unsigned int slotNo)
{
#ifdef ADAFRUIT_DISPLAY
LCDColor(7); //ICE
adafruitLCDColour(AC_ICE);
#endif
if (m_rows == 2U && m_cols == 16U) {
@ -498,16 +492,17 @@ void CHD44780::writeFusion(const char* source, const char* dest)
assert(source != NULL);
assert(dest != NULL);
#ifdef ADAFRUIT_DISPLAY
adafruitLCDColour(AC_RED);
#endif
::lcdClear(m_fd);
// WFV
if (m_PWM == 1U) {
if (m_PWMPin != 1U) {
::softPwmWrite(m_PWMPin, m_PWMBright);
}
else {
::pwmWrite(m_PWMPin, (m_PWMBright/100)*1024);
}
if (m_pwm) {
if (m_pwmPin != 1U)
::softPwmWrite(m_pwmPin, m_pwmBright);
else
::pwmWrite(m_pwmPin, (m_pwmBright / 100) * 1024);
}
::lcdPosition(m_fd, 0, 0);
@ -549,6 +544,10 @@ void CHD44780::writeFusion(const char* source, const char* dest)
void CHD44780::clearFusion()
{
#ifdef ADAFRUIT_DISPLAY
adafruitLCDColour(AC_ICE);
#endif
if (m_rows == 2U && m_cols == 16U) {
::lcdPosition(m_fd, 0, 1);
::lcdPrintf(m_fd, "%.*s", m_cols, LISTENING);

28
HD44780.h
View file

@ -26,6 +26,17 @@
#include <mcp23017.h>
enum ADAFRUIT_COLOUR {
AC_OFF,
AC_WHITE,
AC_RED,
AC_GREEN,
AC_BLUE,
AC_PURPLE,
AC_YELLOW,
AC_ICE
};
// Defines for the Adafruit Pi LCD interface board
#ifdef ADAFRUIT_DISPLAY
#define AF_BASE 100
@ -40,7 +51,7 @@
class CHD44780 : public IDisplay
{
public:
CHD44780(unsigned int rows, unsigned int cols, const std::string& callsign, unsigned int dmrid, const std::vector<unsigned int>& pins, unsigned int PWM, unsigned int PWMPin, unsigned int PWMBright, unsigned int PWMDim);
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);
virtual ~CHD44780();
virtual bool open();
@ -72,20 +83,17 @@ private:
unsigned int m_d1;
unsigned int m_d2;
unsigned int m_d3;
// WFV
unsigned int m_PWM;
unsigned int m_PWMPin;
unsigned int m_PWMBright;
unsigned int m_PWMDim;
bool m_pwm;
unsigned int m_pwmPin;
unsigned int m_pwmBright;
unsigned int m_pwmDim;
int m_fd;
bool m_dmr;
#ifdef ADAFRUIT_DISPLAY
void adafruitLCDSetup();
void adafruitLCDSetup();
void adafruitLCDColour(ADAFRUIT_COLOUR colour);
#endif
};
#endif

21
MMDVMHost.cpp
View file

@ -572,12 +572,6 @@ void CMMDVMHost::createDisplay()
std::string callsign = m_conf.getCallsign();
unsigned int dmrid = m_conf.getDMRId();
// WFV
unsigned int PWM = m_conf.getHD44780PWM();
unsigned int PWMPin = m_conf.getHD44780PWMPin();
unsigned int PWMBright = m_conf.getHD44780PWMBright();
unsigned int PWMDim = m_conf.getHD44780PWMDim();
LogInfo("Display Parameters");
LogInfo(" Type: %s", type.c_str());
@ -604,21 +598,24 @@ void CMMDVMHost::createDisplay()
unsigned int rows = m_conf.getHD44780Rows();
unsigned int columns = m_conf.getHD44780Columns();
std::vector<unsigned int> pins = m_conf.getHD44780Pins();
bool pwm = m_conf.getHD44780PWM();
unsigned int pwmPin = m_conf.getHD44780PWMPin();
unsigned int pwmBright = m_conf.getHD44780PWMBright();
unsigned int pwmDim = m_conf.getHD44780PWMDim();
if (pins.size() == 6U) {
LogInfo(" Rows: %u", rows);
LogInfo(" Columns: %u", columns);
LogInfo(" Pins: %u,%u,%u,%u,%u,%u", pins.at(0U), pins.at(1U), pins.at(2U), pins.at(3U), pins.at(4U), pins.at(5U));
// WFV
if (PWM == 1U) {
if (pwm) {
LogInfo("PWM Brightness Control Enabled");
LogInfo(" PWM Pin: %u", PWMPin);
LogInfo(" PWM Bright: %u", PWMBright);
LogInfo(" PWM Dim: %u", PWMDim);
LogInfo(" PWM Pin: %u", pwmPin);
LogInfo(" PWM Bright: %u", pwmBright);
LogInfo(" PWM Dim: %u", pwmDim);
}
m_display = new CHD44780(rows, columns, callsign, dmrid, pins, PWM, PWMPin, PWMBright, PWMDim);
m_display = new CHD44780(rows, columns, callsign, dmrid, pins, pwm, pwmPin, pwmBright, pwmDim);
}
#endif
} else {