MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 23:45:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into IAX

Browse Source
This commit is contained in:
Jonathan Naylor
2024-07-03 11:55:00 +01:00
parent 953eecdabd 3f2a5d794d
commit 80d08d43a9
24 changed files with 245 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Conf.cpp
View File

@@ -329,6 +329,8 @@ m_nextionUTC(false),
m_nextionIdleBrightness(20U),
m_nextionScreenLayout(0U),
m_nextionTempInFahrenheit(false),
m_nextionOutput(false),
m_nextionUDPPort(6759),
m_oledType(3U),
m_oledBrightness(0U),
m_oledInvert(false),
@@ -1127,6 +1129,10 @@ bool CConf::read()
m_nextionScreenLayout = (unsigned int)::strtoul(value, NULL, 0);
else if (::strcmp(key, "DisplayTempInFahrenheit") == 0)
m_nextionTempInFahrenheit = ::atoi(value) == 1;
else if (::strcmp(key, "NextionOutput") == 0)
m_nextionOutput = ::atoi(value) == 1;
else if (::strcmp(key, "NextionUDPPort") == 0)
m_nextionUDPPort = (unsigned short)::atoi(value);
} else if (section == SECTION_OLED) {
if (::strcmp(key, "Type") == 0)
m_oledType = (unsigned char)::atoi(value);
@@ -2481,6 +2487,21 @@ unsigned int CConf::getNextionScreenLayout() const
return m_nextionScreenLayout;
}
bool CConf::getNextionTempInFahrenheit() const
{
return m_nextionTempInFahrenheit;
}
bool CConf::getNextionOutput() const
{
return m_nextionOutput;
}
unsigned short CConf::getNextionUDPPort() const
{
return m_nextionUDPPort;
}
unsigned char CConf::getOLEDType() const
{
return m_oledType;
@@ -2541,11 +2562,6 @@ bool CConf::getLCDprocDimOnIdle() const
return m_lcdprocDimOnIdle;
}
bool CConf::getNextionTempInFahrenheit() const
{
return m_nextionTempInFahrenheit;
}
bool CConf::getLockFileEnabled() const
{
return m_lockFileEnabled;