MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2026-02-05 06:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into AX25

Browse Source
This commit is contained in:
Jonathan Naylor
2020-07-02 13:21:18 +01:00
parent fb6fb70ffb 5dcdfd8159
commit 8c52246be8
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

@@ -405,6 +405,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) {
@@ -950,7 +953,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) {