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

Disable display rotation selection

Browse Source
This commit is contained in:
Ben V. Brown
2021-05-06 19:33:51 +10:00
parent 1b3445cefa
commit bd25aefe29
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/Core/Inc/configuration.h
View File

@@ -219,6 +219,7 @@
#define MIN_TEMP_F 60 // Min soldering temp selectable °F #define MIN_TEMP_F 60 // Min soldering temp selectable °F
#define MIN_BOOST_TEMP_C 150 // The min settable temp for boost mode °C #define MIN_BOOST_TEMP_C 150 // The min settable temp for boost mode °C
#define MIN_BOOST_TEMP_F 300 // The min settable temp for boost mode °F #define MIN_BOOST_TEMP_F 300 // The min settable temp for boost mode °F
#define NO_DISPLAY_ROTATE // Disable OLED rotation by accel
#endif #endif

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

@@ -47,8 +47,10 @@ static bool settings_setScrollSpeed(void);
static bool settings_displayScrollSpeed(void); static bool settings_displayScrollSpeed(void);
static bool settings_setPowerLimit(void); static bool settings_setPowerLimit(void);
static bool settings_displayPowerLimit(void); static bool settings_displayPowerLimit(void);
#ifndef NO_DISPLAY_ROTATE
static bool settings_setDisplayRotation(void); static bool settings_setDisplayRotation(void);
static bool settings_displayDisplayRotation(void); static bool settings_displayDisplayRotation(void);
#endif
static bool settings_setBoostTemp(void); static bool settings_setBoostTemp(void);
static bool settings_displayBoostTemp(void); static bool settings_displayBoostTemp(void);
static bool settings_setAutomaticStartMode(void); static bool settings_setAutomaticStartMode(void);
@@ -201,8 +203,10 @@ const menuitem UIMenu[] = {
*/ */
{SETTINGS_DESC(SettingsItemIndex::TemperatureUnit), settings_setTempF, {SETTINGS_DESC(SettingsItemIndex::TemperatureUnit), settings_setTempF,
settings_displayTempF}, /* Temperature units, this has to be the first element in the array to work with the logic in settings_enterUIMenu() */ settings_displayTempF}, /* Temperature units, this has to be the first element in the array to work with the logic in settings_enterUIMenu() */
{SETTINGS_DESC(SettingsItemIndex::DisplayRotation), settings_setDisplayRotation, settings_displayDisplayRotation}, /*Display Rotation*/ #ifndef NO_DISPLAY_ROTATE
{SETTINGS_DESC(SettingsItemIndex::CooldownBlink), settings_setCoolingBlinkEnabled, settings_displayCoolingBlinkEnabled}, /*Cooling blink warning*/ {SETTINGS_DESC(SettingsItemIndex::DisplayRotation), settings_setDisplayRotation, settings_displayDisplayRotation}, /*Display Rotation*/
#endif
{SETTINGS_DESC(SettingsItemIndex::CooldownBlink), settings_setCoolingBlinkEnabled, settings_displayCoolingBlinkEnabled}, /*Cooling blink warning*/
{SETTINGS_DESC(SettingsItemIndex::ScrollingSpeed), settings_setScrollSpeed, settings_displayScrollSpeed}, /*Scroll Speed for descriptions*/ {SETTINGS_DESC(SettingsItemIndex::ScrollingSpeed), settings_setScrollSpeed, settings_displayScrollSpeed}, /*Scroll Speed for descriptions*/
{SETTINGS_DESC(SettingsItemIndex::ReverseButtonTempChange), settings_setReverseButtonTempChangeEnabled, settings_displayReverseButtonTempChangeEnabled}, /* Reverse Temp change buttons + - */ {SETTINGS_DESC(SettingsItemIndex::ReverseButtonTempChange), settings_setReverseButtonTempChangeEnabled, settings_displayReverseButtonTempChangeEnabled}, /* Reverse Temp change buttons + - */
{SETTINGS_DESC(SettingsItemIndex::AnimSpeed), settings_setAnimationSpeed, settings_displayAnimationSpeed}, /*Animation Speed adjustment */ {SETTINGS_DESC(SettingsItemIndex::AnimSpeed), settings_setAnimationSpeed, settings_displayAnimationSpeed}, /*Animation Speed adjustment */
@@ -545,6 +549,7 @@ static bool settings_displayScrollSpeed(void) {
return false; return false;
} }
#ifndef NO_DISPLAY_ROTATE
static bool settings_setDisplayRotation(void) { static bool settings_setDisplayRotation(void) {
systemSettings.OrientationMode++; systemSettings.OrientationMode++;
systemSettings.OrientationMode = systemSettings.OrientationMode % 3; systemSettings.OrientationMode = systemSettings.OrientationMode % 3;
@@ -583,7 +588,7 @@ static bool settings_displayDisplayRotation(void) {
} }
return false; return false;
} }
#endif
static bool settings_setBoostTemp(void) { static bool settings_setBoostTemp(void) {
if (systemSettings.temperatureInF) { if (systemSettings.temperatureInF) {
if (systemSettings.BoostTemp == 0) { if (systemSettings.BoostTemp == 0) {