Contrast -> Brightness

As it makes a little more sense in a 1 bit display

Translations/translation_BG.json

@@ -202,8 +202,8 @@
       "text2": ["Език:", " BG   Български"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_CS.json

@@ -201,8 +201,8 @@
       "text2": ["Řeč:", " CS       Český"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_DA.json

@@ -201,8 +201,8 @@
       "text2": ["Sprog :", " DA       Dansk"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_DE.json

@@ -202,8 +202,8 @@
       "text2": ["Sprache:", " DE     Deutsch"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_EN.json

@@ -202,8 +202,8 @@
       "text2": ["Language:", " EN     English"],
       "desc": "Current firmware language"
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_ES.json

@@ -202,8 +202,8 @@
       "text2": ["Language:", " ES  Castellano"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_FI.json

@@ -200,8 +200,8 @@
       "text2": ["Kieli:", " FI       Suomi"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_FR.json

@@ -201,8 +201,8 @@
       "text2": ["Langue :", " FR    Français"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_HR.json

@@ -201,8 +201,8 @@
       "text2": ["Jezik:", " HR    Hrvatski"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_HU.json

@@ -201,8 +201,8 @@
       "text2": ["Nyelv:", " HU      Magyar"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_IT.json

@@ -201,8 +201,8 @@
       "text2": ["Lingua:", " IT    Italiano"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_JA_JP.json

@@ -202,8 +202,8 @@
       "text2": "言語： 日本語",
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_LT.json

@@ -201,8 +201,8 @@
       "text2": ["Kalba:", " LT    Lietuvių"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_NL.json

@@ -201,8 +201,8 @@
       "text2": ["Spraak :", " NL  Nederlands"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_NL_BE.json

@@ -201,8 +201,8 @@
       "text2": ["Spraak:", " NL_BE   Vlaams"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_NO.json

@@ -201,8 +201,8 @@
       "text2": ["Språk:", " NO       Norsk"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_PL.json

@@ -202,8 +202,8 @@
       "text2": ["Język :", " PL      Polski"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_PT.json

@@ -201,8 +201,8 @@
       "text2": ["Idioma :", " PT   Português"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_RU.json

@@ -201,8 +201,8 @@
       "text2": ["Язык:", " RU     Русский"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_SK.json

@@ -201,8 +201,8 @@
       "text2": ["Jazyk:", " SK  Slovenčina"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_SL.json

@@ -201,8 +201,8 @@
       "text2": ["Jezik:", " SL Slovenščina"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_SR_CYRL.json

@@ -201,8 +201,8 @@
       "text2": ["Jезик:", " SR      Српски"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_SR_LATN.json

@@ -201,8 +201,8 @@
       "text2": ["Jezik:", " SR      Srpski"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_SV.json

@@ -195,8 +195,8 @@
       "text2": ["Språk:", " SV     Svenska"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_TR.json

@@ -213,8 +213,8 @@
       "text2": ["Dil:", " TR      Türkçe"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_UK.json

@@ -201,8 +201,8 @@
       "text2": ["Мова:", " UK  Українська"],
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_YUE_HK.json

@@ -202,8 +202,8 @@
       "text2": "語言： 廣東話",
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_ZH_CN.json

@@ -202,8 +202,8 @@
       "text2": "语言：简体中文",
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translation_ZH_TW.json

@@ -203,8 +203,8 @@
       "text2": "語言：正體中文",
       "desc": ""
     },
-    "Contrast": {
+    "Brightness": {
-      "text2": ["Screen", "Contrast"],
+      "text2": ["Screen", "Brightness"],
       "desc": "Adjust the contrast/brightness of the OLED screen"
     },
     "ColourInversion": {

Translations/translations_def.js

@@ -355,7 +355,7 @@ var def =
 			"maxLen2": 15
 		},
 		{
-			"id": "Contrast",
+			"id": "Brightness",
 			"maxLen": 7,
 			"maxLen2": 15
 		},

source/Core/Drivers/OLED.cpp

@@ -45,7 +45,7 @@ I2C_CLASS::I2C_REG OLED_Setup_Array[] = {
     {0x80, 0x14, 0}, /*Charge Pump settings*/
     {0x80, 0xDA, 0}, /*Set VCOM Pins hardware config*/
     {0x80, 0x02, 0}, /*Combination 2*/
-    {0x80, 0x81, 0}, /*Contrast*/
+    {0x80, 0x81, 0}, /*Brightness*/
     {0x80, 0x00, 0}, /*^0*/
     {0x80, 0xD9, 0}, /*Set pre-charge period*/
     {0x80, 0xF1, 0}, /*Pre charge period*/
@@ -362,7 +362,7 @@ void OLED::setRotation(bool leftHanded) {
   screenBuffer[9] = inLeftHandedMode ? 0xC8 : 0xC0;
 }
 
-void OLED::setContrast(uint8_t contrast) {
+void OLED::setBrightness(uint8_t contrast) {
   OLED_Setup_Array[15].val = contrast;
   I2C_CLASS::writeRegistersBulk(DEVICEADDR_OLED, &OLED_Setup_Array[14], 2);
 }

source/Core/Drivers/OLED.hpp

@@ -62,7 +62,7 @@ public:
   static void setRotation(bool leftHanded); // Set the rotation for the screen
   // Get the current rotation of the LCD
   static bool    getRotation() { return inLeftHandedMode; }
-  static void    setContrast(uint8_t contrast);
+  static void    setBrightness(uint8_t contrast);
   static void    setInverseDisplay(bool inverted);
   static int16_t getCursorX() { return cursor_x; }
   static void    print(const char *string, FontStyle fontStyle); // Draw a string to the current location, with selected font

source/Core/Inc/Settings.h

@@ -48,7 +48,7 @@ enum SettingsOptions {
   UILanguage                     = 31, // Selected UI Language code, null-terminated *only if* the length is less than 8 chars
   PDNegTimeout                   = 32, // PD timeout in 100ms steps
   OLEDInversion                  = 33, // Invert the colours on the display
-  OLEDContrast                   = 34, // Contrast for the OLED display
+  OLEDBrightness                 = 34, // Brightness for the OLED display
 
   //
   SettingsOptionsLength = 35, //

source/Core/Inc/Translation.h

@@ -59,7 +59,7 @@ enum class SettingsItemIndex : uint8_t {
   PowerPulseWait,
   PowerPulseDuration,
   LanguageSwitch,
-  Contrast,
+  Brightness,
   ColourInversion,
   NUM_ITEMS,
 };

source/Core/Src/Settings.cpp

@@ -76,7 +76,7 @@ static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOp
     {0, 0xFFFF, 0, 41431 /*EN*/},                                   // UILanguage
     {0, 51, 1, 0},                                                  // PDNegTimeout
     {0, 2, 1, 0},                                                   // OLEDInversion
-    {7, 256, 0x08, 51},                                             // OLEDContrast
+    {7, 256, 0x08, 51},                                             // OLEDBrightness
 
 };
 static_assert((sizeof(settingsConstants) / sizeof(SettingConstants)) == ((int)SettingsOptions::SettingsOptionsLength));
@@ -144,7 +144,7 @@ bool nextSettingValue(const enum SettingsOptions option) {
   } else {
     systemSettings.settingsValues[(int)option] += constants.increment;
   }
-  return systemSettings.settingsValues[(int)option] == constants.max - constants.increment;
+  return (constants.max - systemSettings.settingsValues[(int)option]) < constants.increment;
 }
 
 bool prevSettingValue(const enum SettingsOptions option) {

source/Core/Src/gui.cpp

@@ -199,7 +199,7 @@ const menuitem UIMenu[] = {
      SettingsOptions::ReverseButtonTempChangeEnabled},                                                                         /* Reverse Temp change buttons + - */
     {SETTINGS_DESC(SettingsItemIndex::AnimSpeed), nullptr, settings_displayAnimationSpeed, SettingsOptions::AnimationSpeed},   /*Animation Speed adjustment */
     {SETTINGS_DESC(SettingsItemIndex::AnimLoop), nullptr, settings_displayAnimationLoop, SettingsOptions::AnimationLoop},      /*Animation Loop switch */
-    {SETTINGS_DESC(SettingsItemIndex::Contrast), nullptr, settings_displayBrightnessLevel, SettingsOptions::OLEDContrast},     /*Brightness Level*/
+    {SETTINGS_DESC(SettingsItemIndex::Brightness), nullptr, settings_displayBrightnessLevel, SettingsOptions::OLEDBrightness}, /*Brightness Level*/
     {SETTINGS_DESC(SettingsItemIndex::ColourInversion), nullptr, settings_displayInvertColor, SettingsOptions::OLEDInversion}, /*Invert screen colour*/
     {0, nullptr, nullptr, SettingsOptions::SettingsOptionsLength}                                                              // end of menu marker. DO NOT REMOVE
 };
@@ -786,15 +786,20 @@ static bool settings_displayPowerPulseDuration(void) {
 static bool settings_displayBrightnessLevel(void) {
   OLED::drawArea(0, 0, 16, 16, brightnessIcon);
   OLED::setCursor(5 * FONT_12_WIDTH - 2, 0);
-  OLED::printNumber(getSettingValue(SettingsOptions::OLEDContrast), 3, FontStyle::LARGE);
+  // printShortDescription(SettingsItemIndex::Brightness, 7);
-  OLED::setContrast(getSettingValue(SettingsOptions::OLEDContrast));
+  OLED::printNumber(getSettingValue(SettingsOptions::OLEDBrightness), 3, FontStyle::LARGE);
+  // While not optimal to apply this here, it is _very_ convienient
+  OLED::setBrightness(getSettingValue(SettingsOptions::OLEDBrightness));
   return false;
 }
 
 static bool settings_displayInvertColor(void) {
   OLED::drawArea(0, 0, 24, 16, invertDisplayIcon);
   OLED::setCursor(7 * FONT_12_WIDTH - 2, 0);
+  // printShortDescription(SettingsItemIndex::ColourInversion, 7);
+
   OLED::drawCheckbox(getSettingValue(SettingsOptions::OLEDInversion));
+  // While not optimal to apply this here, it is _very_ convienient
   OLED::setInverseDisplay(getSettingValue(SettingsOptions::OLEDInversion));
   return false;
 }

source/Core/Threads/GUIThread.cpp

@@ -799,6 +799,8 @@ void startGUITask(void const *argument) {
   prepareTranslations();
 
   OLED::initialize(); // start up the LCD
+  OLED::setBrightness(getSettingValue(SettingsOptions::OLEDBrightness));
+  OLED::setInverseDisplay(getSettingValue(SettingsOptions::OLEDInversion));
 
   uint8_t tempWarningState       = 0;
   bool    buttonLockout          = false;