From 9c8abbdfc21445f39bcf0534c508248fe2015248 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Sun, 26 Mar 2023 01:43:56 +0100 Subject: [PATCH] Readjusting brightness (Pinecil v2) (#1622) --- source/Core/BSP/MHP30/configuration.h | 9 +++ source/Core/BSP/Miniware/configuration.h | 9 +++ source/Core/BSP/Pinecil/configuration.h | 9 +++ source/Core/BSP/Pinecilv2/configuration.h | 9 +++ source/Core/Src/Settings.cpp | 78 +++++++++++------------ source/Core/Src/settingsGUI.cpp | 2 +- 6 files changed, 76 insertions(+), 40 deletions(-) diff --git a/source/Core/BSP/MHP30/configuration.h b/source/Core/BSP/MHP30/configuration.h index 3cc7202d..c3ecd127 100644 --- a/source/Core/BSP/MHP30/configuration.h +++ b/source/Core/BSP/MHP30/configuration.h @@ -60,6 +60,15 @@ #define ORIENTATION_MODE 0 // 0: Right 1:Left 2:Automatic - Default right #define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change +/** + * OLED Brightness + * + */ +#define MIN_BRIGHTNESS 0 // Min OLED brightness selectable +#define MAX_BRIGHTNESS 100 // Max OLED brightness selectable +#define BRIGHTNESS_STEP 25 // OLED brightness increment +#define DEFAULT_BRIGHTNESS 25 // default OLED brightness + /** * Temp change settings */ diff --git a/source/Core/BSP/Miniware/configuration.h b/source/Core/BSP/Miniware/configuration.h index e0df0efe..bd8efce2 100644 --- a/source/Core/BSP/Miniware/configuration.h +++ b/source/Core/BSP/Miniware/configuration.h @@ -59,6 +59,15 @@ #define ORIENTATION_MODE 2 // 0: Right 1:Left 2:Automatic - Default Automatic #define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change +/** + * OLED Brightness + * + */ +#define MIN_BRIGHTNESS 0 // Min OLED brightness selectable +#define MAX_BRIGHTNESS 100 // Max OLED brightness selectable +#define BRIGHTNESS_STEP 25 // OLED brightness increment +#define DEFAULT_BRIGHTNESS 25 // default OLED brightness + /** * Temp change settings */ diff --git a/source/Core/BSP/Pinecil/configuration.h b/source/Core/BSP/Pinecil/configuration.h index f029c6b3..bb418e1d 100644 --- a/source/Core/BSP/Pinecil/configuration.h +++ b/source/Core/BSP/Pinecil/configuration.h @@ -59,6 +59,15 @@ #define ORIENTATION_MODE 2 // 0: Right 1:Left 2:Automatic - Default Automatic #define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change +/** + * OLED Brightness + * + */ +#define MIN_BRIGHTNESS 0 // Min OLED brightness selectable +#define MAX_BRIGHTNESS 100 // Max OLED brightness selectable +#define BRIGHTNESS_STEP 25 // OLED brightness increment +#define DEFAULT_BRIGHTNESS 25 // default OLED brightness + /** * Temp change settings */ diff --git a/source/Core/BSP/Pinecilv2/configuration.h b/source/Core/BSP/Pinecilv2/configuration.h index bdf1e619..1fbd630b 100644 --- a/source/Core/BSP/Pinecilv2/configuration.h +++ b/source/Core/BSP/Pinecilv2/configuration.h @@ -59,6 +59,15 @@ #define ORIENTATION_MODE 2 // 0: Right 1:Left 2:Automatic - Default Automatic #define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change +/** + * OLED Brightness + * + */ +#define MIN_BRIGHTNESS 1 // Min OLED brightness selectable +#define MAX_BRIGHTNESS 101 // Max OLED brightness selectable +#define BRIGHTNESS_STEP 25 // OLED brightness increment +#define DEFAULT_BRIGHTNESS 26 // default OLED brightness + /** * Temp change settings */ diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp index 542a60fb..a6e18b61 100644 --- a/source/Core/Src/Settings.cpp +++ b/source/Core/Src/Settings.cpp @@ -49,45 +49,45 @@ typedef struct { static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOptionsLength] = { //{min,max,increment,default} - {MIN_TEMP_C, MAX_TEMP_F, 5, 320}, // SolderingTemp - {MIN_TEMP_C, MAX_TEMP_F, 5, 150}, // SleepTemp - {0, 15, 1, SLEEP_TIME}, // SleepTime - {0, 4, 1, CUT_OUT_SETTING}, // MinDCVoltageCells - {24, 38, 1, RECOM_VOL_CELL}, // MinVoltageCells - {90, QC_VOLTAGE_MAX, 2, 90}, // QCIdealVoltage - {0, 2, 1, ORIENTATION_MODE}, // OrientationMode - {0, 9, 1, SENSITIVITY}, // Sensitivity - {0, 1, 1, ANIMATION_LOOP}, // AnimationLoop - {0, settingOffSpeed_t::MAX_VALUE - 1, 1, ANIMATION_SPEED}, // AnimationSpeed - {0, 3, 1, AUTO_START_MODE}, // AutoStartMode - {0, 60, 1, SHUTDOWN_TIME}, // ShutdownTime - {0, 1, 1, COOLING_TEMP_BLINK}, // CoolingTempBlink - {0, 1, 1, DETAILED_IDLE}, // DetailedIDLE - {0, 1, 1, DETAILED_SOLDERING}, // DetailedSoldering - {0, 1, 1, TEMPERATURE_INF}, // TemperatureInF - {0, 1, 1, DESCRIPTION_SCROLL_SPEED}, // DescriptionScrollSpeed - {0, 2, 1, LOCKING_MODE}, // LockingMode - {0, 99, 1, POWER_PULSE_DEFAULT}, // KeepAwakePulse - {1, POWER_PULSE_WAIT_MAX, 1, POWER_PULSE_WAIT_DEFAULT}, // KeepAwakePulseWait - {1, POWER_PULSE_DURATION_MAX, 1, POWER_PULSE_DURATION_DEFAULT}, // KeepAwakePulseDuration - {360, 900, 1, VOLTAGE_DIV}, // VoltageDiv - {0, MAX_TEMP_F, 10, BOOST_TEMP}, // BoostTemp - {MIN_CALIBRATION_OFFSET, 2500, 1, CALIBRATION_OFFSET}, // CalibrationOffset - {0, MAX_POWER_LIMIT, POWER_LIMIT_STEPS, POWER_LIMIT}, // PowerLimit - {0, 1, 1, REVERSE_BUTTON_TEMP_CHANGE}, // ReverseButtonTempChangeEnabled - {5, TEMP_CHANGE_LONG_STEP_MAX, 5, TEMP_CHANGE_LONG_STEP}, // TempChangeLongStep - {1, TEMP_CHANGE_SHORT_STEP_MAX, 1, TEMP_CHANGE_SHORT_STEP}, // TempChangeShortStep - {0, 9, 1, 7}, // HallEffectSensitivity - {0, 9, 1, 0}, // AccelMissingWarningCounter - {0, 9, 1, 0}, // PDMissingWarningCounter - {0, 0xFFFF, 0, 41431 /*EN*/}, // UILanguage - {0, 50, 1, 20}, // PDNegTimeout - {0, 1, 1, 0}, // OLEDInversion - {0, 99, 11, 33}, // OLEDBrightness - {0, 5, 1, 1}, // LOGOTime - {0, 1, 1, 0}, // CalibrateCJC - {0, 1, 1, 1}, // BLEEnabled - {0, 1, 1, 1}, // PDVpdoEnabled + {MIN_TEMP_C, MAX_TEMP_F, 5, 320}, // SolderingTemp + {MIN_TEMP_C, MAX_TEMP_F, 5, 150}, // SleepTemp + {0, 15, 1, SLEEP_TIME}, // SleepTime + {0, 4, 1, CUT_OUT_SETTING}, // MinDCVoltageCells + {24, 38, 1, RECOM_VOL_CELL}, // MinVoltageCells + {90, QC_VOLTAGE_MAX, 2, 90}, // QCIdealVoltage + {0, 2, 1, ORIENTATION_MODE}, // OrientationMode + {0, 9, 1, SENSITIVITY}, // Sensitivity + {0, 1, 1, ANIMATION_LOOP}, // AnimationLoop + {0, settingOffSpeed_t::MAX_VALUE - 1, 1, ANIMATION_SPEED}, // AnimationSpeed + {0, 3, 1, AUTO_START_MODE}, // AutoStartMode + {0, 60, 1, SHUTDOWN_TIME}, // ShutdownTime + {0, 1, 1, COOLING_TEMP_BLINK}, // CoolingTempBlink + {0, 1, 1, DETAILED_IDLE}, // DetailedIDLE + {0, 1, 1, DETAILED_SOLDERING}, // DetailedSoldering + {0, 1, 1, TEMPERATURE_INF}, // TemperatureInF + {0, 1, 1, DESCRIPTION_SCROLL_SPEED}, // DescriptionScrollSpeed + {0, 2, 1, LOCKING_MODE}, // LockingMode + {0, 99, 1, POWER_PULSE_DEFAULT}, // KeepAwakePulse + {1, POWER_PULSE_WAIT_MAX, 1, POWER_PULSE_WAIT_DEFAULT}, // KeepAwakePulseWait + {1, POWER_PULSE_DURATION_MAX, 1, POWER_PULSE_DURATION_DEFAULT}, // KeepAwakePulseDuration + {360, 900, 1, VOLTAGE_DIV}, // VoltageDiv + {0, MAX_TEMP_F, 10, BOOST_TEMP}, // BoostTemp + {MIN_CALIBRATION_OFFSET, 2500, 1, CALIBRATION_OFFSET}, // CalibrationOffset + {0, MAX_POWER_LIMIT, POWER_LIMIT_STEPS, POWER_LIMIT}, // PowerLimit + {0, 1, 1, REVERSE_BUTTON_TEMP_CHANGE}, // ReverseButtonTempChangeEnabled + {5, TEMP_CHANGE_LONG_STEP_MAX, 5, TEMP_CHANGE_LONG_STEP}, // TempChangeLongStep + {1, TEMP_CHANGE_SHORT_STEP_MAX, 1, TEMP_CHANGE_SHORT_STEP}, // TempChangeShortStep + {0, 9, 1, 7}, // HallEffectSensitivity + {0, 9, 1, 0}, // AccelMissingWarningCounter + {0, 9, 1, 0}, // PDMissingWarningCounter + {0, 0xFFFF, 0, 41431 /*EN*/}, // UILanguage + {0, 50, 1, 20}, // PDNegTimeout + {0, 1, 1, 0}, // OLEDInversion + {MIN_BRIGHTNESS, MAX_BRIGHTNESS, BRIGHTNESS_STEP, DEFAULT_BRIGHTNESS}, // OLEDBrightness + {0, 5, 1, 1}, // LOGOTime + {0, 1, 1, 0}, // CalibrateCJC + {0, 1, 1, 1}, // BLEEnabled + {0, 1, 1, 1}, // PDVpdoEnabled }; static_assert((sizeof(settingsConstants) / sizeof(SettingConstants)) == ((int)SettingsOptions::SettingsOptionsLength)); diff --git a/source/Core/Src/settingsGUI.cpp b/source/Core/Src/settingsGUI.cpp index 479407ff..09bba80c 100644 --- a/source/Core/Src/settingsGUI.cpp +++ b/source/Core/Src/settingsGUI.cpp @@ -616,7 +616,7 @@ static void displayAnimationLoop(void) { OLED::drawCheckbox(getSettingValue(Sett static void displayBrightnessLevel(void) { - OLED::printNumber((getSettingValue(SettingsOptions::OLEDBrightness) / 11 + 1), 2, FontStyle::LARGE); + OLED::printNumber((getSettingValue(SettingsOptions::OLEDBrightness) / BRIGHTNESS_STEP + 1), 2, FontStyle::LARGE); // While not optimal to apply this here, it is _very_ convienient OLED::setBrightness(getSettingValue(SettingsOptions::OLEDBrightness)); }