sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Fix settings bug

Browse Source
This commit is contained in:
Ben V. Brown
2021-09-12 19:06:50 +10:00
parent 45116fb7b1
commit 87a96bcff7
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/Core/Src/Settings.cpp
View File

@@ -139,7 +139,7 @@ uint16_t getSettingValue(const enum SettingsOptions option) { return systemSetti
bool nextSettingValue(const enum SettingsOptions option) { bool nextSettingValue(const enum SettingsOptions option) {
const auto constants = settingsConstants[(int)option]; const auto constants = settingsConstants[(int)option];
if (systemSettings.settingsValues[(int)option] == (constants.max - constants.increment)) { if (systemSettings.settingsValues[(int)option] >= (constants.max - constants.increment)) {
systemSettings.settingsValues[(int)option] = constants.min; systemSettings.settingsValues[(int)option] = constants.min;
} else { } else {
systemSettings.settingsValues[(int)option] += constants.increment; systemSettings.settingsValues[(int)option] += constants.increment;
@@ -150,7 +150,7 @@ bool nextSettingValue(const enum SettingsOptions option) {
bool prevSettingValue(const enum SettingsOptions option) { bool prevSettingValue(const enum SettingsOptions option) {
const auto constants = settingsConstants[(int)option]; const auto constants = settingsConstants[(int)option];
int value = systemSettings.settingsValues[(int)option]; int value = systemSettings.settingsValues[(int)option];
if (value == constants.min) { if (value <= constants.min) {
value = constants.max; value = constants.max;
} else { } else {
value -= constants.increment; value -= constants.increment;

2
source/Core/Src/gui.cpp
View File

@@ -787,6 +787,7 @@ static bool settings_displayBrightnessLevel(void) {
OLED::drawArea(0, 0, 16, 16, brightnessIcon); OLED::drawArea(0, 0, 16, 16, brightnessIcon);
OLED::setCursor(5 * FONT_12_WIDTH - 2, 0); OLED::setCursor(5 * FONT_12_WIDTH - 2, 0);
OLED::printNumber(getSettingValue(SettingsOptions::OLEDContrast), 3, FontStyle::LARGE); OLED::printNumber(getSettingValue(SettingsOptions::OLEDContrast), 3, FontStyle::LARGE);
OLED::setContrast(getSettingValue(SettingsOptions::OLEDContrast));
return false; return false;
} }
@@ -794,6 +795,7 @@ static bool settings_displayInvertColor(void) {
OLED::drawArea(0, 0, 24, 16, invertDisplayIcon); OLED::drawArea(0, 0, 24, 16, invertDisplayIcon);
OLED::setCursor(7 * FONT_12_WIDTH - 2, 0); OLED::setCursor(7 * FONT_12_WIDTH - 2, 0);
OLED::drawCheckbox(getSettingValue(SettingsOptions::OLEDInversion)); OLED::drawCheckbox(getSettingValue(SettingsOptions::OLEDInversion));
OLED::setInverseDisplay(getSettingValue(SettingsOptions::OLEDInversion));
return false; return false;
} }