g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-05 14:35:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'AX25' into AX25_FM

Browse source
This commit is contained in:
Jonathan Naylor 2020-07-02 16:38:53 +01:00
commit ba1b6a8751
5 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Conf.cpp
View file

@ -420,6 +420,9 @@ bool CConf::read()
if (len > 1U && *value == '"' && value[len - 1U] == '"') {
value[len - 1U] = '\0';
value++;
} else {
// if value is not quoted, remove after # (to make comment)
::strtok(value, "#");
}
if (section == SECTION_GENERAL) {
@ -989,7 +992,7 @@ bool CConf::read()
else if (::strcmp(key, "IdleBrightness") == 0)
m_nextionIdleBrightness = (unsigned int)::atoi(value);
else if (::strcmp(key, "ScreenLayout") == 0)
m_nextionScreenLayout = (unsigned int)::atoi(value);
m_nextionScreenLayout = (unsigned int)::strtoul(value, NULL, 0);
else if (::strcmp(key, "DisplayTempInFahrenheit") == 0)
m_nextionTempInFahrenheit = ::atoi(value) == 1;
} else if (section == SECTION_OLED) {