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

revert removing inverted screen IV.

Browse Source
This commit is contained in:
discip
2022-01-07 22:02:54 +01:00
committed by GitHub
parent 055b70d45b
commit 5b00e95255
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@ static void settings_displayPowerPulseWait(void);
static bool settings_showPowerPulseOptions(void); static bool settings_showPowerPulseOptions(void);
static void settings_displayPowerPulseDuration(void); static void settings_displayPowerPulseDuration(void);
static void settings_displayBrightnessLevel(void); static void settings_displayBrightnessLevel(void);
// static void settings_displayInvertColor(void); static void settings_displayInvertColor(void);
#ifdef HALL_SENSOR #ifdef HALL_SENSOR
static void settings_displayHallEffect(void); static void settings_displayHallEffect(void);
@@ -119,7 +119,7 @@ static bool settings_enterAdvancedMenu(void);
* Animation Speed * Animation Speed
* -Animation Loop * -Animation Loop
* OLED Brightnes * OLED Brightnes
* // Invert Screen * Invert Screen
* Detailed IDLE * Detailed IDLE
* Detailed Soldering * Detailed Soldering
* *
@@ -131,7 +131,6 @@ static bool settings_enterAdvancedMenu(void);
* Power Pulse * Power Pulse
* -Power Pulse Delay * -Power Pulse Delay
* -Power Pulse duration * -Power Pulse duration
* //Logo Time
* *
*/ */
const menuitem rootSettingsMenu[] { const menuitem rootSettingsMenu[] {
@@ -222,7 +221,7 @@ const menuitem UIMenu[] = {
* Animation Speed * Animation Speed
* -Animation Loop * -Animation Loop
* OLED Brightnes * OLED Brightnes
* //Invert Screen * Invert Screen
* Detailed IDLE * Detailed IDLE
* Detailed Soldering * Detailed Soldering
*/ */
@@ -238,10 +237,10 @@ const menuitem UIMenu[] = {
{SETTINGS_DESC(SettingsItemIndex::AnimSpeed), nullptr, settings_displayAnimationSpeed, nullptr, SettingsOptions::AnimationSpeed}, /*Animation Speed adjustment */ {SETTINGS_DESC(SettingsItemIndex::AnimSpeed), nullptr, settings_displayAnimationSpeed, nullptr, SettingsOptions::AnimationSpeed}, /*Animation Speed adjustment */
{SETTINGS_DESC(SettingsItemIndex::AnimLoop), nullptr, settings_displayAnimationLoop, settings_displayAnimationOptions, SettingsOptions::AnimationLoop}, /*Animation Loop switch */ {SETTINGS_DESC(SettingsItemIndex::AnimLoop), nullptr, settings_displayAnimationLoop, settings_displayAnimationOptions, SettingsOptions::AnimationLoop}, /*Animation Loop switch */
{SETTINGS_DESC(SettingsItemIndex::Brightness), nullptr, settings_displayBrightnessLevel, nullptr, SettingsOptions::OLEDBrightness}, /*Brightness Level*/ {SETTINGS_DESC(SettingsItemIndex::Brightness), nullptr, settings_displayBrightnessLevel, nullptr, SettingsOptions::OLEDBrightness}, /*Brightness Level*/
// {SETTINGS_DESC(SettingsItemIndex::ColourInversion), nullptr, settings_displayInvertColor, nullptr, SettingsOptions::OLEDInversion}, /*Invert screen colour*/ {SETTINGS_DESC(SettingsItemIndex::ColourInversion), nullptr, settings_displayInvertColor, nullptr, SettingsOptions::OLEDInversion}, /*Invert screen colour*/
{SETTINGS_DESC(SettingsItemIndex::AdvancedIdle), nullptr, settings_displayAdvancedIDLEScreens, nullptr, SettingsOptions::DetailedIDLE}, /*Advanced idle screen*/ {SETTINGS_DESC(SettingsItemIndex::AdvancedIdle), nullptr, settings_displayAdvancedIDLEScreens, nullptr, SettingsOptions::DetailedIDLE}, /*Advanced idle screen*/
{SETTINGS_DESC(SettingsItemIndex::AdvancedSoldering), nullptr, settings_displayAdvancedSolderingScreens, nullptr, SettingsOptions::DetailedSoldering}, /*Advanced soldering screen*/ {SETTINGS_DESC(SettingsItemIndex::AdvancedSoldering), nullptr, settings_displayAdvancedSolderingScreens, nullptr, SettingsOptions::DetailedSoldering}, /*Advanced soldering screen*/
{0, nullptr, nullptr, nullptr, SettingsOptions::SettingsOptionsLength} // end of menu marker. DO NOT REMOVE {0, nullptr, nullptr, nullptr, SettingsOptions::SettingsOptionsLength} // end of menu marker. DO NOT REMOVE
}; };
const menuitem advancedMenu[] = { const menuitem advancedMenu[] = {
@@ -761,7 +760,7 @@ static void settings_displayBrightnessLevel(void) {
// While not optimal to apply this here, it is _very_ convienient // While not optimal to apply this here, it is _very_ convienient
OLED::setBrightness(getSettingValue(SettingsOptions::OLEDBrightness)); OLED::setBrightness(getSettingValue(SettingsOptions::OLEDBrightness));
} }
/*
static void settings_displayInvertColor(void) { static void 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);
@@ -770,7 +769,7 @@ static void settings_displayInvertColor(void) {
OLED::drawCheckbox(getSettingValue(SettingsOptions::OLEDInversion)); OLED::drawCheckbox(getSettingValue(SettingsOptions::OLEDInversion));
// While not optimal to apply this here, it is _very_ convienient // While not optimal to apply this here, it is _very_ convienient
OLED::setInverseDisplay(getSettingValue(SettingsOptions::OLEDInversion)); OLED::setInverseDisplay(getSettingValue(SettingsOptions::OLEDInversion));
} */ }
#ifdef HALL_SENSOR #ifdef HALL_SENSOR
static void settings_displayHallEffect(void) { static void settings_displayHallEffect(void) {