From 5fd16bb6733b910df2d94d50193ba3ceb903b34e Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Thu, 30 Sep 2021 13:25:51 +0200 Subject: [PATCH] adjusted max brightness (#1087) * Delete Development Resources/Images directory * jpg -> png * fix value alignment for PD timeout * Delete 001_TS80.png * replace TS80 logo * Update Settings.cpp * Update gui.cpp * Update Settings.cpp * adding missing en dash * Update translation_EN.json * Update Settings.cpp * Update gui.cpp --- Translations/translation_EN.json | 10 +++++----- source/Core/Src/Settings.cpp | 2 +- source/Core/Src/gui.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Translations/translation_EN.json b/Translations/translation_EN.json index bfc93bec..7c7bb4f3 100644 --- a/Translations/translation_EN.json +++ b/Translations/translation_EN.json @@ -4,7 +4,7 @@ "fonts": ["ascii_basic"], "tempUnitFahrenheit": true, "messages": { - "SettingsCalibrationWarning": "Please ensure the tip is at room temperature, before continuing!", + "SettingsCalibrationWarning": "Please ensure the tip is at room temperature, before proceeding!", "SettingsResetWarning": "Sure you want to restore default settings?", "UVLOWarningString": "DC LOW", "UndervoltageString": "Undervoltage", @@ -150,15 +150,15 @@ }, "ReverseButtonTempChange": { "text2": ["Reverse", "+ - keys"], - "desc": "Reverse assignment of temperature adjustment buttons" + "desc": "Reverse assignment of buttons for temperature adjustment" }, "TempChangeShortStep": { "text2": ["Temp change", "short"], - "desc": "Temperature change increment on short button press" + "desc": "Temperature-change-increment on short button press" }, "TempChangeLongStep": { "text2": ["Temp change", "long"], - "desc": "Temperature change increment on long button press" + "desc": "Temperature-change-increment on long button press" }, "PowerPulsePower": { "text2": ["Power", "pulse"], @@ -186,7 +186,7 @@ }, "PowerPulseWait": { "text2": ["Power pulse", "delay"], - "desc": "Delay before keep-awake pulse is triggered (x 2.5s)" + "desc": "Delay before keep-awake-pulse is triggered (x 2.5s)" }, "PowerPulseDuration": { "text2": ["Power pulse", "duration"], diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp index cfa192f6..898c9067 100644 --- a/source/Core/Src/Settings.cpp +++ b/source/Core/Src/Settings.cpp @@ -82,7 +82,7 @@ static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOp {0, 0xFFFF, 0, 41431 /*EN*/}, // UILanguage {0, 51, 1, 0}, // PDNegTimeout {0, 2, 1, 0}, // OLEDInversion - {3, 256, 28, 59}, // OLEDBrightness + {0, 100, 11, 33}, // OLEDBrightness }; static_assert((sizeof(settingsConstants) / sizeof(SettingConstants)) == ((int)SettingsOptions::SettingsOptionsLength)); diff --git a/source/Core/Src/gui.cpp b/source/Core/Src/gui.cpp index 9c023816..86864033 100644 --- a/source/Core/Src/gui.cpp +++ b/source/Core/Src/gui.cpp @@ -743,7 +743,7 @@ static void settings_displayBrightnessLevel(void) { OLED::drawArea(0, 0, 16, 16, brightnessIcon); OLED::setCursor(5 * FONT_12_WIDTH - 2, 0); // printShortDescription(SettingsItemIndex::Brightness, 7); - OLED::printNumber(((getSettingValue(SettingsOptions::OLEDBrightness) + 25) / 28), 3, FontStyle::LARGE); + OLED::printNumber((getSettingValue(SettingsOptions::OLEDBrightness) / 11 + 1), 3, FontStyle::LARGE); // While not optimal to apply this here, it is _very_ convienient OLED::setBrightness(getSettingValue(SettingsOptions::OLEDBrightness)); }