Merge branch 'master' into mqtt

This commit is contained in:
Jonathan Naylor
2024-01-04 13:57:22 +00:00
8 changed files with 49 additions and 18 deletions

View File

@@ -314,6 +314,7 @@ m_ax25NetworkSpeed(9600U),
m_ax25NetworkDebug(false),
m_tftSerialPort("/dev/ttyAMA0"),
m_tftSerialBrightness(50U),
m_tftSerialScreenLayout(0U),
m_hd44780Rows(2U),
m_hd44780Columns(16U),
m_hd44780Pins(),
@@ -1092,6 +1093,8 @@ bool CConf::read()
m_tftSerialPort = value;
else if (::strcmp(key, "Brightness") == 0)
m_tftSerialBrightness = (unsigned int)::atoi(value);
else if (::strcmp(key, "ScreenLayout") == 0)
m_tftSerialScreenLayout = (unsigned int)::atoi(value);
} else if (section == SECTION_HD44780) {
if (::strcmp(key, "Rows") == 0)
m_hd44780Rows = (unsigned int)::atoi(value);
@@ -2413,6 +2416,11 @@ unsigned int CConf::getTFTSerialBrightness() const
return m_tftSerialBrightness;
}
unsigned int CConf::getTFTSerialScreenLayout() const
{
return m_tftSerialScreenLayout;
}
unsigned int CConf::getHD44780Rows() const
{
return m_hd44780Rows;