Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: revert Zorro default contrast #3831

Merged
merged 2 commits into from
Jul 23, 2023
Merged

fix: revert Zorro default contrast #3831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf707d0
fix: revert Zorro default contrast
3djc Jul 19, 2023
f03e158
fix: set contrast as soon as radio data is read
3djc Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion radio/src/opentx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1450,6 +1450,10 @@ void opentxInit()

bool radioSettingsValid = storageReadRadioSettings(false);
(void)radioSettingsValid;

#if defined(GUI) && !defined(COLORLCD)
lcdSetContrast();
#endif
#endif

BACKLIGHT_ENABLE(); // we start the backlight during the startup animation
Expand Down Expand Up @@ -1588,7 +1592,7 @@ void opentxInit()
}
#endif

#if defined(GUI) && !defined(COLORLCD)
#if defined(GUI) && !defined(COLORLCD) && !defined(STARTUP_ANIMATION)
lcdSetContrast();
#endif

Expand Down
2 changes: 1 addition & 1 deletion radio/src/targets/taranis/board.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ void ledBlue();

#if defined(OLED_SCREEN)
#define LCD_CONTRAST_DEFAULT 255 // full brightness
#elif defined(RADIO_TX12) || defined(RADIO_TX12MK2) || defined(RADIO_ZORRO) || defined(RADIO_BOXER)
#elif defined(RADIO_TX12) || defined(RADIO_TX12MK2) || defined(RADIO_BOXER)
#define LCD_CONTRAST_DEFAULT 20
#elif defined(RADIO_TPRO) || defined(RADIO_FAMILY_JUMPER_T12) || defined(RADIO_TPRO) || defined(RADIO_COMMANDO8)
#define LCD_CONTRAST_DEFAULT 25
Expand Down