C function backlightOn() renamed to resetBacklightTimeout()
This commit is contained in:
@@ -46,7 +46,7 @@ void showAlertBox(const char * title, const char * text, const char * action, ui
|
|||||||
lcdRefresh();
|
lcdRefresh();
|
||||||
lcdSetContrast();
|
lcdSetContrast();
|
||||||
waitKeysReleased();
|
waitKeysReleased();
|
||||||
backlightOn();
|
resetBacklightTimeout();
|
||||||
checkBacklight();
|
checkBacklight();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -227,7 +227,7 @@ void showAlertBox(const char * title, const char * text, const char * action , u
|
|||||||
lcdRefresh();
|
lcdRefresh();
|
||||||
lcdSetContrast();
|
lcdSetContrast();
|
||||||
waitKeysReleased();
|
waitKeysReleased();
|
||||||
backlightOn();
|
resetBacklightTimeout();
|
||||||
checkBacklight();
|
checkBacklight();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ Reset the backlight timeout
|
|||||||
static int luaLcdResetBacklightTimeout(lua_State * L)
|
static int luaLcdResetBacklightTimeout(lua_State * L)
|
||||||
{
|
{
|
||||||
if (!luaLcdAllowed) return 0;
|
if (!luaLcdAllowed) return 0;
|
||||||
backlightOn();
|
resetBacklightTimeout();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -687,7 +687,7 @@ void checkBacklight()
|
|||||||
if (inputsMoved()) {
|
if (inputsMoved()) {
|
||||||
inactivity.counter = 0;
|
inactivity.counter = 0;
|
||||||
if (g_eeGeneral.backlightMode & e_backlight_mode_sticks) {
|
if (g_eeGeneral.backlightMode & e_backlight_mode_sticks) {
|
||||||
backlightOn();
|
resetBacklightTimeout();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -700,7 +700,7 @@ void checkBacklight()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void backlightOn()
|
void resetBacklightTimeout()
|
||||||
{
|
{
|
||||||
lightOffCounter = ((uint16_t)g_eeGeneral.lightAutoOff*250) << 1;
|
lightOffCounter = ((uint16_t)g_eeGeneral.lightAutoOff*250) << 1;
|
||||||
}
|
}
|
||||||
@@ -727,7 +727,7 @@ void doSplash()
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (SPLASH_NEEDED()) {
|
if (SPLASH_NEEDED()) {
|
||||||
backlightOn();
|
resetBacklightTimeout();
|
||||||
drawSplash();
|
drawSplash();
|
||||||
|
|
||||||
#if defined(PCBSKY9X)
|
#if defined(PCBSKY9X)
|
||||||
@@ -1977,7 +1977,7 @@ void opentxInit()
|
|||||||
|
|
||||||
if (g_eeGeneral.backlightMode != e_backlight_mode_off) {
|
if (g_eeGeneral.backlightMode != e_backlight_mode_off) {
|
||||||
// on Tx start turn the light on
|
// on Tx start turn the light on
|
||||||
backlightOn();
|
resetBacklightTimeout();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!globalData.unexpectedShutdown) {
|
if (!globalData.unexpectedShutdown) {
|
||||||
@@ -1995,7 +1995,7 @@ void opentxInit()
|
|||||||
lcdSetContrast();
|
lcdSetContrast();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
backlightOn();
|
resetBacklightTimeout();
|
||||||
|
|
||||||
startPulses();
|
startPulses();
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -635,7 +635,7 @@ static inline void GET_ADC_IF_MIXER_NOT_RUNNING()
|
|||||||
|
|
||||||
#include "sbus.h"
|
#include "sbus.h"
|
||||||
|
|
||||||
void backlightOn();
|
void resetBacklightTimeout();
|
||||||
void checkBacklight();
|
void checkBacklight();
|
||||||
|
|
||||||
#define BITMASK(bit) (1<<(bit))
|
#define BITMASK(bit) (1<<(bit))
|
||||||
|
|||||||
@@ -642,7 +642,7 @@ void checkSwitches()
|
|||||||
}
|
}
|
||||||
|
|
||||||
LED_ERROR_BEGIN();
|
LED_ERROR_BEGIN();
|
||||||
backlightOn();
|
resetBacklightTimeout();
|
||||||
|
|
||||||
// first - display warning
|
// first - display warning
|
||||||
#if defined(PCBTARANIS) || defined(PCBHORUS)
|
#if defined(PCBTARANIS) || defined(PCBHORUS)
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ void rotaryEncoderCheck()
|
|||||||
#endif
|
#endif
|
||||||
#if !defined(BOOT)
|
#if !defined(BOOT)
|
||||||
if (g_eeGeneral.backlightMode & e_backlight_mode_keys) {
|
if (g_eeGeneral.backlightMode & e_backlight_mode_keys) {
|
||||||
backlightOn();
|
resetBacklightTimeout();
|
||||||
}
|
}
|
||||||
inactivity.counter = 0;
|
inactivity.counter = 0;
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ void readKeysAndTrims()
|
|||||||
|
|
||||||
if ((keys_input || trims_input) && (g_eeGeneral.backlightMode & e_backlight_mode_keys)) {
|
if ((keys_input || trims_input) && (g_eeGeneral.backlightMode & e_backlight_mode_keys)) {
|
||||||
// on keypress turn the light on
|
// on keypress turn the light on
|
||||||
backlightOn();
|
resetBacklightTimeout();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -501,7 +501,7 @@ void readKeysAndTrims()
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (keysInput || trimsInput) {
|
if (keysInput || trimsInput) {
|
||||||
backlightOn();
|
resetBacklightTimeout();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ void readKeysAndTrims()
|
|||||||
|
|
||||||
if ((keys_input || trims_input) && (g_eeGeneral.backlightMode & e_backlight_mode_keys)) {
|
if ((keys_input || trims_input) && (g_eeGeneral.backlightMode & e_backlight_mode_keys)) {
|
||||||
// on keypress turn the light on
|
// on keypress turn the light on
|
||||||
backlightOn();
|
resetBacklightTimeout();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -130,7 +130,7 @@ void readKeysAndTrims()
|
|||||||
if ((keys_input || trims_input) && (g_eeGeneral.backlightMode & e_backlight_mode_keys)) {
|
if ((keys_input || trims_input) && (g_eeGeneral.backlightMode & e_backlight_mode_keys)) {
|
||||||
#endif
|
#endif
|
||||||
// on keypress turn the light on
|
// on keypress turn the light on
|
||||||
backlightOn();
|
resetBacklightTimeout();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user