From 4e890dd5693e1571fc09a87fb7d782334724ba74 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Fri, 7 Jan 2022 02:53:21 +0100 Subject: [PATCH 01/16] changed default orientation to auto for TS100/80(P) --- source/Core/BSP/Miniware/configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Core/BSP/Miniware/configuration.h b/source/Core/BSP/Miniware/configuration.h index 8dc85625..69ff81af 100644 --- a/source/Core/BSP/Miniware/configuration.h +++ b/source/Core/BSP/Miniware/configuration.h @@ -56,7 +56,7 @@ * OLED Orientation * */ -#define ORIENTATION_MODE 0 // 0: Right 1:Left 2:Automatic - Default right +#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 /** From 9a05a392c1e204eb80a2824abfa5fcefc1752491 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Fri, 7 Jan 2022 02:54:36 +0100 Subject: [PATCH 02/16] changed default orientation to auto for Pinecil --- source/Core/BSP/Pine64/configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Core/BSP/Pine64/configuration.h b/source/Core/BSP/Pine64/configuration.h index a77450bf..d013f63f 100644 --- a/source/Core/BSP/Pine64/configuration.h +++ b/source/Core/BSP/Pine64/configuration.h @@ -56,7 +56,7 @@ * OLED Orientation * */ -#define ORIENTATION_MODE 0 // 0: Right 1:Left 2:Automatic - Default right +#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 /** From 585fe5dec9fce878ca150ac0c2b130dfc95f904c Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Fri, 7 Jan 2022 02:57:55 +0100 Subject: [PATCH 03/16] part 1 of removed invert screen via commenting --- source/Core/Drivers/Font.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Core/Drivers/Font.h b/source/Core/Drivers/Font.h index 38ae386c..a3c4d40d 100644 --- a/source/Core/Drivers/Font.h +++ b/source/Core/Drivers/Font.h @@ -200,10 +200,10 @@ const uint8_t disconnectedTipIconFlip[] = { const uint8_t brightnessIcon[] = {0x80, 0x86, 0x8E, 0x9C, 0x18, 0xC0, 0xE0, 0xEF, 0xEF, 0xE0, 0xC0, 0x18, 0x9C, 0x8E, 0x86, 0x80, 0x01, 0x61, 0x71, 0x39, 0x18, 0x03, 0x07, 0xF7, 0xF7, 0x07, 0x03, 0x18, 0x39, 0x71, 0x61, 0x01}; -// 24 x 16 +/* // 24 x 16 const uint8_t invertDisplayIcon[] = {0xFE, 0x01, 0x79, 0x25, 0x79, 0x01, 0xFE, 0x00, 0x20, 0x20, 0x20, 0x20, 0xDF, 0x07, 0x8F, 0xDF, 0xFF, 0x01, 0xFE, 0x86, 0xDA, 0x86, 0xFE, 0x01, 0x7F, 0x80, 0xA4, 0xBE, 0xA0, 0x80, 0x7F, 0x00, 0x04, 0x0E, 0x1F, 0x04, 0xFB, 0xFB, 0xFB, 0xFB, 0xFF, 0x80, 0x7F, 0x5B, 0x41, 0x5F, 0x7F, 0x80}; - +*/ /* * 16x16 icons * 32 * 3 = Frame size * Frame count From 250199d996313bc18355d988075cd4e3b565dd8f Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Fri, 7 Jan 2022 03:00:33 +0100 Subject: [PATCH 04/16] part 2 of removed invert screen via commenting --- source/Core/Inc/Settings.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/Core/Inc/Settings.h b/source/Core/Inc/Settings.h index cf30ced4..ec0fba42 100644 --- a/source/Core/Inc/Settings.h +++ b/source/Core/Inc/Settings.h @@ -47,11 +47,11 @@ enum SettingsOptions { PDMissingWarningCounter = 30, // Counter of how many times we have warned we cannot detect the pd interface 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 - OLEDBrightness = 34, // Brightness for the OLED display + OLEDBrightness = 33, // Brightness for the OLED display + // OLEDInversion = 34, // Invert the colours on the display // - SettingsOptionsLength = 35, // + SettingsOptionsLength = 34, // }; typedef enum { From 0e4319ff2e292be02bb72a81322fbd3553009aeb Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Fri, 7 Jan 2022 03:01:16 +0100 Subject: [PATCH 05/16] part 3 of removed invert screen via commenting --- source/Core/Src/Settings.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp index e09501c3..074a8d72 100644 --- a/source/Core/Src/Settings.cpp +++ b/source/Core/Src/Settings.cpp @@ -82,9 +82,10 @@ static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOp {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, 1, 1, 0}, // OLEDInversion + }; static_assert((sizeof(settingsConstants) / sizeof(SettingConstants)) == ((int)SettingsOptions::SettingsOptionsLength)); From 12dfcd76aa1309f39ec60f65afb7aecbf2fd8ea5 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Fri, 7 Jan 2022 03:02:38 +0100 Subject: [PATCH 06/16] part 4 of removed invert screen via commenting and some cleanup --- source/Core/Src/gui.cpp | 124 ++++++++++++++++++++++------------------ 1 file changed, 68 insertions(+), 56 deletions(-) diff --git a/source/Core/Src/gui.cpp b/source/Core/Src/gui.cpp index b562491d..f9917e81 100644 --- a/source/Core/Src/gui.cpp +++ b/source/Core/Src/gui.cpp @@ -68,7 +68,7 @@ static void settings_displayPowerPulseWait(void); static bool settings_showPowerPulseOptions(void); static void settings_displayPowerPulseDuration(void); static void settings_displayBrightnessLevel(void); -static void settings_displayInvertColor(void); +// static void settings_displayInvertColor(void); #ifdef HALL_SENSOR static void settings_displayHallEffect(void); @@ -92,39 +92,46 @@ static bool settings_enterAdvancedMenu(void); * * Power Menu * Power Source + * -Minimum Voltage + * QC Voltage + * PD Timeout * * Soldering - * Boost Mode Enabled * Boost Mode Temp * Auto Start * Temp change short step * Temp change long step * Locking Mode - * * Power Saving - * Sleep Temp - * Sleep Time - * Shutdown Time * Motion Sensitivity + * -Sleep Temp + * -Sleep Time + * -Shutdown Time * * UI * // Language - * Scrolling Speed * Temperature Unit * Display orientation * Cooldown blink + * Scrolling Speed * Reverse Temp change buttons + - - * - * Advanced - * Enable Power Limit - * Power Limit + * Animation Speed + * -Animation Loop + * OLED Brightnes + * // Invert Screen * Detailed IDLE * Detailed Soldering - * Logo Time + * + * Advanced + * Power Limit + * Factory Reset * Calibrate Temperature * Calibrate Input V - * Reset Settings + * Power Pulse + * -Power Pulse Delay + * -Power Pulse duration + * //Logo Time * */ const menuitem rootSettingsMenu[] { @@ -153,7 +160,10 @@ const menuitem rootSettingsMenu[] { #if defined(POW_DC) || defined(POW_QC) || defined(POW_PD) const menuitem powerMenu[] = { /* - * Power Source + * Power Source + * -Minimum Voltage + * QC Voltage + * PD Timeout */ #ifdef POW_DC {SETTINGS_DESC(SettingsItemIndex::DCInCutoff), nullptr, settings_displayInputVRange, nullptr, SettingsOptions::MinDCVoltageCells}, /*Voltage input*/ @@ -170,11 +180,11 @@ const menuitem powerMenu[] = { #endif const menuitem solderingMenu[] = { /* - * Boost Mode Enabled - * Boost Mode Temp + * Boost Temp * Auto Start * Temp change short step * Temp change long step + * Locking Mode */ {SETTINGS_DESC(SettingsItemIndex::BoostTemperature), settings_setBoostTemp, settings_displayBoostTemp, nullptr, SettingsOptions::SettingsOptionsLength}, /*Boost Temp*/ {SETTINGS_DESC(SettingsItemIndex::AutoStart), nullptr, settings_displayAutomaticStartMode, nullptr, SettingsOptions::AutoStartMode}, /*Auto start*/ @@ -183,40 +193,12 @@ const menuitem solderingMenu[] = { {SETTINGS_DESC(SettingsItemIndex::LockingMode), nullptr, settings_displayLockingMode, nullptr, SettingsOptions::LockingMode}, /*Locking Mode*/ {0, nullptr, nullptr, nullptr, SettingsOptions::SettingsOptionsLength} // end of menu marker. DO NOT REMOVE }; -const menuitem UIMenu[] = { - /* - // Language - * Scrolling Speed - * Temperature Unit - * Display orientation - * Cooldown blink - * Reverse Temp change buttons + - - * Detailed IDLE - * Detailed Soldering - */ - {SETTINGS_DESC(SettingsItemIndex::TemperatureUnit), settings_setTempF, settings_displayTempF, nullptr, - SettingsOptions::SettingsOptionsLength}, /* Temperature units, this has to be the first element in the array to work with the logic in settings_enterUIMenu() */ -#ifndef NO_DISPLAY_ROTATE - {SETTINGS_DESC(SettingsItemIndex::DisplayRotation), settings_setDisplayRotation, settings_displayDisplayRotation, nullptr, SettingsOptions::SettingsOptionsLength}, /*Display Rotation*/ -#endif - {SETTINGS_DESC(SettingsItemIndex::CooldownBlink), nullptr, settings_displayCoolingBlinkEnabled, nullptr, SettingsOptions::CoolingTempBlink}, /*Cooling blink warning*/ - {SETTINGS_DESC(SettingsItemIndex::ScrollingSpeed), nullptr, settings_displayScrollSpeed, nullptr, SettingsOptions::DescriptionScrollSpeed}, /*Scroll Speed for descriptions*/ - {SETTINGS_DESC(SettingsItemIndex::ReverseButtonTempChange), nullptr, settings_displayReverseButtonTempChangeEnabled, nullptr, - SettingsOptions::ReverseButtonTempChangeEnabled}, /* Reverse Temp change buttons + - */ - {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::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::AdvancedIdle), nullptr, settings_displayAdvancedIDLEScreens, nullptr, SettingsOptions::DetailedIDLE}, /* Advanced idle 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 -}; const menuitem PowerSavingMenu[] = { /* - * Motion Sensitivity - * Sleep Temp - * Sleep Time - * Shutdown Time + * Motion Sensitivity + * -Sleep Temp + * -Sleep Time + * -Shutdown Time */ #ifndef NO_SLEEP_MODE {SETTINGS_DESC(SettingsItemIndex::MotionSensitivity), nullptr, settings_displaySensitivity, nullptr, SettingsOptions::Sensitivity}, /* Motion Sensitivity*/ @@ -229,18 +211,48 @@ const menuitem PowerSavingMenu[] = { #endif {0, nullptr, nullptr, nullptr, SettingsOptions::SettingsOptionsLength} // end of menu marker. DO NOT REMOVE }; +const menuitem UIMenu[] = { + /* + * // Language + * Temperature Unit + * Display orientation + * Cooldown blink + * Scrolling Speed + * Reverse Temp change buttons + - + * Animation Speed + * -Animation Loop + * OLED Brightnes + * //Invert Screen + * Detailed IDLE + * Detailed Soldering + */ + {SETTINGS_DESC(SettingsItemIndex::TemperatureUnit), settings_setTempF, settings_displayTempF, nullptr, + SettingsOptions::SettingsOptionsLength}, /* Temperature units, this has to be the first element in the array to work with the logic in settings_enterUIMenu() */ +#ifndef NO_DISPLAY_ROTATE + {SETTINGS_DESC(SettingsItemIndex::DisplayRotation), settings_setDisplayRotation, settings_displayDisplayRotation, nullptr, SettingsOptions::SettingsOptionsLength}, /*Display Rotation*/ +#endif + {SETTINGS_DESC(SettingsItemIndex::CooldownBlink), nullptr, settings_displayCoolingBlinkEnabled, nullptr, SettingsOptions::CoolingTempBlink}, /*Cooling blink warning*/ + {SETTINGS_DESC(SettingsItemIndex::ScrollingSpeed), nullptr, settings_displayScrollSpeed, nullptr, SettingsOptions::DescriptionScrollSpeed}, /*Scroll Speed for descriptions*/ + {SETTINGS_DESC(SettingsItemIndex::ReverseButtonTempChange), nullptr, settings_displayReverseButtonTempChangeEnabled, nullptr, + SettingsOptions::ReverseButtonTempChangeEnabled}, /*Reverse Temp change buttons + - */ + {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::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::AdvancedIdle), nullptr, settings_displayAdvancedIDLEScreens, nullptr, SettingsOptions::DetailedIDLE}, /*Advanced idle 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 +}; const menuitem advancedMenu[] = { /* - * Power limit + * Power Limit + * Factory Reset * Calibrate Temperature * Calibrate Input V - * Reset Settings * Power Pulse - * Animation Loop - * Animation Speed - * Power Pulse Wait - * Power Pulse Duration + * -Power Pulse Delay + * -Power Pulse duration */ {SETTINGS_DESC(SettingsItemIndex::PowerLimit), nullptr, settings_displayPowerLimit, nullptr, SettingsOptions::PowerLimit}, /*Power limit*/ {SETTINGS_DESC(SettingsItemIndex::SettingsReset), settings_setResetSettings, settings_displayResetSettings, nullptr, SettingsOptions::SettingsOptionsLength}, /*Resets settings*/ @@ -749,7 +761,7 @@ static void settings_displayBrightnessLevel(void) { // While not optimal to apply this here, it is _very_ convienient OLED::setBrightness(getSettingValue(SettingsOptions::OLEDBrightness)); } - +/* static void settings_displayInvertColor(void) { OLED::drawArea(0, 0, 24, 16, invertDisplayIcon); OLED::setCursor(7 * FONT_12_WIDTH - 2, 0); @@ -758,7 +770,7 @@ static void settings_displayInvertColor(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::OLEDInversion)); // While not optimal to apply this here, it is _very_ convienient OLED::setInverseDisplay(getSettingValue(SettingsOptions::OLEDInversion)); -} +} */ #ifdef HALL_SENSOR static void settings_displayHallEffect(void) { From f3808e0ba46fe7ab04e95bc6d2f57ac4a59a1880 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Fri, 7 Jan 2022 03:03:27 +0100 Subject: [PATCH 07/16] part 5 of removed invert screen via commenting --- source/Core/Threads/GUIThread.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp index c2f3d689..ab91e2ac 100644 --- a/source/Core/Threads/GUIThread.cpp +++ b/source/Core/Threads/GUIThread.cpp @@ -839,7 +839,7 @@ void startGUITask(void const *argument) { OLED::initialize(); // start up the LCD OLED::setBrightness(getSettingValue(SettingsOptions::OLEDBrightness)); - OLED::setInverseDisplay(getSettingValue(SettingsOptions::OLEDInversion)); + // OLED::setInverseDisplay(getSettingValue(SettingsOptions::OLEDInversion)); uint8_t tempWarningState = 0; bool buttonLockout = false; From 566e27d698595c859d62ff97523fc88d92918ab5 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Fri, 7 Jan 2022 21:56:03 +0100 Subject: [PATCH 08/16] revert removing inverted screen I. --- source/Core/Drivers/Font.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Core/Drivers/Font.h b/source/Core/Drivers/Font.h index a3c4d40d..38ae386c 100644 --- a/source/Core/Drivers/Font.h +++ b/source/Core/Drivers/Font.h @@ -200,10 +200,10 @@ const uint8_t disconnectedTipIconFlip[] = { const uint8_t brightnessIcon[] = {0x80, 0x86, 0x8E, 0x9C, 0x18, 0xC0, 0xE0, 0xEF, 0xEF, 0xE0, 0xC0, 0x18, 0x9C, 0x8E, 0x86, 0x80, 0x01, 0x61, 0x71, 0x39, 0x18, 0x03, 0x07, 0xF7, 0xF7, 0x07, 0x03, 0x18, 0x39, 0x71, 0x61, 0x01}; -/* // 24 x 16 +// 24 x 16 const uint8_t invertDisplayIcon[] = {0xFE, 0x01, 0x79, 0x25, 0x79, 0x01, 0xFE, 0x00, 0x20, 0x20, 0x20, 0x20, 0xDF, 0x07, 0x8F, 0xDF, 0xFF, 0x01, 0xFE, 0x86, 0xDA, 0x86, 0xFE, 0x01, 0x7F, 0x80, 0xA4, 0xBE, 0xA0, 0x80, 0x7F, 0x00, 0x04, 0x0E, 0x1F, 0x04, 0xFB, 0xFB, 0xFB, 0xFB, 0xFF, 0x80, 0x7F, 0x5B, 0x41, 0x5F, 0x7F, 0x80}; -*/ + /* * 16x16 icons * 32 * 3 = Frame size * Frame count From 4061bfb182dbf7ae4985e8491a8c59347601d25e Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Fri, 7 Jan 2022 21:57:04 +0100 Subject: [PATCH 09/16] revert removing inverted screen II. --- source/Core/Inc/Settings.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Core/Inc/Settings.h b/source/Core/Inc/Settings.h index ec0fba42..df477597 100644 --- a/source/Core/Inc/Settings.h +++ b/source/Core/Inc/Settings.h @@ -48,10 +48,10 @@ 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 OLEDBrightness = 33, // Brightness for the OLED display - // OLEDInversion = 34, // Invert the colours on the display + OLEDInversion = 34, // Invert the colours on the display // - SettingsOptionsLength = 34, // + SettingsOptionsLength = 35, // }; typedef enum { From 055b70d45bf98326af8a1de3afca3e17551df0df Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Fri, 7 Jan 2022 21:57:56 +0100 Subject: [PATCH 10/16] revert removing inverted screen III. --- source/Core/Src/Settings.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp index 074a8d72..6f8dbcae 100644 --- a/source/Core/Src/Settings.cpp +++ b/source/Core/Src/Settings.cpp @@ -83,8 +83,7 @@ static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOp {0, 0xFFFF, 0, 41431 /*EN*/}, // UILanguage {0, 50, 1, 20}, // PDNegTimeout {0, 99, 11, 33}, // OLEDBrightness - - // {0, 1, 1, 0}, // OLEDInversion + {0, 1, 1, 0}, // OLEDInversion }; static_assert((sizeof(settingsConstants) / sizeof(SettingConstants)) == ((int)SettingsOptions::SettingsOptionsLength)); From 5b00e95255e362da755c181b19dbfa18111d1ff7 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Fri, 7 Jan 2022 22:02:54 +0100 Subject: [PATCH 11/16] revert removing inverted screen IV. --- source/Core/Src/gui.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/source/Core/Src/gui.cpp b/source/Core/Src/gui.cpp index f9917e81..c72b6ea0 100644 --- a/source/Core/Src/gui.cpp +++ b/source/Core/Src/gui.cpp @@ -68,7 +68,7 @@ static void settings_displayPowerPulseWait(void); static bool settings_showPowerPulseOptions(void); static void settings_displayPowerPulseDuration(void); static void settings_displayBrightnessLevel(void); -// static void settings_displayInvertColor(void); +static void settings_displayInvertColor(void); #ifdef HALL_SENSOR static void settings_displayHallEffect(void); @@ -119,7 +119,7 @@ static bool settings_enterAdvancedMenu(void); * Animation Speed * -Animation Loop * OLED Brightnes - * // Invert Screen + * Invert Screen * Detailed IDLE * Detailed Soldering * @@ -131,7 +131,6 @@ static bool settings_enterAdvancedMenu(void); * Power Pulse * -Power Pulse Delay * -Power Pulse duration - * //Logo Time * */ const menuitem rootSettingsMenu[] { @@ -222,7 +221,7 @@ const menuitem UIMenu[] = { * Animation Speed * -Animation Loop * OLED Brightnes - * //Invert Screen + * Invert Screen * Detailed IDLE * 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::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::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::AdvancedSoldering), nullptr, settings_displayAdvancedSolderingScreens, nullptr, SettingsOptions::DetailedSoldering}, /*Advanced soldering screen*/ - {0, nullptr, nullptr, nullptr, SettingsOptions::SettingsOptionsLength} // end of menu marker. DO NOT REMOVE + {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::AdvancedSoldering), nullptr, settings_displayAdvancedSolderingScreens, nullptr, SettingsOptions::DetailedSoldering}, /*Advanced soldering screen*/ + {0, nullptr, nullptr, nullptr, SettingsOptions::SettingsOptionsLength} // end of menu marker. DO NOT REMOVE }; const menuitem advancedMenu[] = { @@ -761,7 +760,7 @@ static void settings_displayBrightnessLevel(void) { // While not optimal to apply this here, it is _very_ convienient OLED::setBrightness(getSettingValue(SettingsOptions::OLEDBrightness)); } -/* + static void settings_displayInvertColor(void) { OLED::drawArea(0, 0, 24, 16, invertDisplayIcon); OLED::setCursor(7 * FONT_12_WIDTH - 2, 0); @@ -770,7 +769,7 @@ static void settings_displayInvertColor(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::OLEDInversion)); // While not optimal to apply this here, it is _very_ convienient OLED::setInverseDisplay(getSettingValue(SettingsOptions::OLEDInversion)); -} */ +} #ifdef HALL_SENSOR static void settings_displayHallEffect(void) { From 6bfe915614c90c0377e99427da705eb03521cf8b Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Fri, 7 Jan 2022 22:04:09 +0100 Subject: [PATCH 12/16] revert removing inverted screen V. --- source/Core/Threads/GUIThread.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp index ab91e2ac..c2f3d689 100644 --- a/source/Core/Threads/GUIThread.cpp +++ b/source/Core/Threads/GUIThread.cpp @@ -839,7 +839,7 @@ void startGUITask(void const *argument) { OLED::initialize(); // start up the LCD OLED::setBrightness(getSettingValue(SettingsOptions::OLEDBrightness)); - // OLED::setInverseDisplay(getSettingValue(SettingsOptions::OLEDInversion)); + OLED::setInverseDisplay(getSettingValue(SettingsOptions::OLEDInversion)); uint8_t tempWarningState = 0; bool buttonLockout = false; From a23ac27fba56ea1e1f43c74e19cb8863a9d65e2f Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Fri, 7 Jan 2022 22:32:46 +0100 Subject: [PATCH 13/16] follow up on detailed mode --- source/Core/Threads/GUIThread.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp index c2f3d689..2c380c69 100644 --- a/source/Core/Threads/GUIThread.cpp +++ b/source/Core/Threads/GUIThread.cpp @@ -553,9 +553,9 @@ static void gui_solderingMode(uint8_t jumpToSleep) { #else if (OLED::getRotation()) { #endif - OLED::setCursor(50, 0); + OLED::setCursor(50, 1); } else { - OLED::setCursor(-1, 0); + OLED::setCursor(-1, 1); } OLED::clearScreen(); // Draw in the screen details @@ -951,9 +951,9 @@ void startGUITask(void const *argument) { #else if (OLED::getRotation()) { #endif - OLED::setCursor(50, 0); + OLED::setCursor(50, 1); } else { - OLED::setCursor(-1, 0); + OLED::setCursor(-1, 1); } if (getSettingValue(SettingsOptions::DetailedIDLE)) { if (isTipDisconnected()) { @@ -972,9 +972,9 @@ void startGUITask(void const *argument) { #else if (OLED::getRotation()) { #endif - OLED::setCursor(-1, 0); + OLED::setCursor(-1, 1); } else { - OLED::setCursor(42, 0); + OLED::setCursor(42, 1); } uint32_t Vlt = getInputVoltageX10(getSettingValue(SettingsOptions::VoltageDiv), 0); OLED::printNumber(Vlt / 10, 2, FontStyle::LARGE); From 83f09496907f6ea0ae9ed14e63da3c334f8cec58 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Fri, 7 Jan 2022 23:25:56 +0100 Subject: [PATCH 14/16] reverted swap I --- source/Core/Inc/Settings.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Core/Inc/Settings.h b/source/Core/Inc/Settings.h index df477597..cf30ced4 100644 --- a/source/Core/Inc/Settings.h +++ b/source/Core/Inc/Settings.h @@ -47,8 +47,8 @@ enum SettingsOptions { PDMissingWarningCounter = 30, // Counter of how many times we have warned we cannot detect the pd interface UILanguage = 31, // Selected UI Language code, null-terminated *only if* the length is less than 8 chars PDNegTimeout = 32, // PD timeout in 100ms steps - OLEDBrightness = 33, // Brightness for the OLED display - OLEDInversion = 34, // Invert the colours on the display + OLEDInversion = 33, // Invert the colours on the display + OLEDBrightness = 34, // Brightness for the OLED display // SettingsOptionsLength = 35, // From 5e5f1b8d9936b2dfd966e326531b00045855dd92 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Fri, 7 Jan 2022 23:26:44 +0100 Subject: [PATCH 15/16] reverted swap II --- source/Core/Src/Settings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp index 6f8dbcae..e09501c3 100644 --- a/source/Core/Src/Settings.cpp +++ b/source/Core/Src/Settings.cpp @@ -82,8 +82,8 @@ static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOp {0, 9, 1, 0}, // PDMissingWarningCounter {0, 0xFFFF, 0, 41431 /*EN*/}, // UILanguage {0, 50, 1, 20}, // PDNegTimeout - {0, 99, 11, 33}, // OLEDBrightness {0, 1, 1, 0}, // OLEDInversion + {0, 99, 11, 33}, // OLEDBrightness }; static_assert((sizeof(settingsConstants) / sizeof(SettingConstants)) == ((int)SettingsOptions::SettingsOptionsLength)); From 21eba602c3dd2df4b6b697dd5bf25c9007306903 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Fri, 7 Jan 2022 23:31:06 +0100 Subject: [PATCH 16/16] cleaning up --- source/Core/Threads/GUIThread.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp index 2c380c69..c2f3d689 100644 --- a/source/Core/Threads/GUIThread.cpp +++ b/source/Core/Threads/GUIThread.cpp @@ -553,9 +553,9 @@ static void gui_solderingMode(uint8_t jumpToSleep) { #else if (OLED::getRotation()) { #endif - OLED::setCursor(50, 1); + OLED::setCursor(50, 0); } else { - OLED::setCursor(-1, 1); + OLED::setCursor(-1, 0); } OLED::clearScreen(); // Draw in the screen details @@ -951,9 +951,9 @@ void startGUITask(void const *argument) { #else if (OLED::getRotation()) { #endif - OLED::setCursor(50, 1); + OLED::setCursor(50, 0); } else { - OLED::setCursor(-1, 1); + OLED::setCursor(-1, 0); } if (getSettingValue(SettingsOptions::DetailedIDLE)) { if (isTipDisconnected()) { @@ -972,9 +972,9 @@ void startGUITask(void const *argument) { #else if (OLED::getRotation()) { #endif - OLED::setCursor(-1, 1); + OLED::setCursor(-1, 0); } else { - OLED::setCursor(42, 1); + OLED::setCursor(42, 0); } uint32_t Vlt = getInputVoltageX10(getSettingValue(SettingsOptions::VoltageDiv), 0); OLED::printNumber(Vlt / 10, 2, FontStyle::LARGE);