1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 16:55:20 +03:00

Cosmetics

This commit is contained in:
Damjan Adamic 2016-08-21 19:18:49 +02:00
parent a043c6f649
commit 64966c7d7d
9 changed files with 57 additions and 57 deletions

View file

@ -446,7 +446,7 @@ void Open9xSim::refreshDisplay()
{
if (simuLcdRefresh) {
simuLcdRefresh = false;
FXColor offColor = isBacklightEnable() ? BL_COLOR : FXRGB(200, 200, 200);
FXColor offColor = isBacklightEnabled() ? BL_COLOR : FXRGB(200, 200, 200);
#if LCD_W == 128
FXColor onColor = FXRGB(0, 0, 0);
#endif
@ -477,7 +477,7 @@ void Open9xSim::refreshDisplay()
uint8_t z = (y & 1) ? (*p >> 4) : (*p & 0x0F);
if (z) {
FXColor color;
if (isBacklightEnable())
if (isBacklightEnabled())
color = FXRGB(47-(z*47)/15, 123-(z*123)/15, 227-(z*227)/15);
else
color = FXRGB(200-(z*200)/15, 200-(z*200)/15, 200-(z*200)/15);

View file

@ -349,7 +349,7 @@ void backlightDisable()
bl_target = g_eeGeneral.blOffBright;
}
bool isBacklightEnable()
bool isBacklightEnabled()
{
return (bl_target==g_eeGeneral.blOnBright);
}

View file

@ -143,16 +143,16 @@ bool checkSlaveMode();
#if defined(PWM_BACKLIGHT)
void backlightEnable();
void backlightDisable();
bool isBacklightEnable();
bool isBacklightEnabled();
void backlightFade();
#elif defined(SP22)
#define backlightEnable() PORTB &= ~(1<<OUT_B_LIGHT)
#define backlightDisable() PORTB |= (1<<OUT_B_LIGHT)
#define isBacklightEnable() (~PORTB & (1<<OUT_B_LIGHT))
#define isBacklightEnabled() (~PORTB & (1<<OUT_B_LIGHT))
#else
#define backlightEnable() PORTB |= (1<<OUT_B_LIGHT)
#define backlightDisable() PORTB &= ~(1<<OUT_B_LIGHT)
#define isBacklightEnable() (PORTB & (1<<OUT_B_LIGHT))
#define isBacklightEnabled() (PORTB & (1<<OUT_B_LIGHT))
#endif
#if defined(VOICE) && !defined(SIMU)
#define BACKLIGHT_ENABLE() Voice.Backlight = 1

View file

@ -90,7 +90,7 @@ void sdPoll10ms();
#define OUT_C_LIGHT 0
#define backlightEnable() PORTC |= (1<<OUT_C_LIGHT)
#define backlightDisable() PORTC &= ~(1<<OUT_C_LIGHT)
#define isBacklightEnable() (PORTC & (1<<OUT_C_LIGHT))
#define isBacklightEnabled() (PORTC & (1<<OUT_C_LIGHT))
#define BACKLIGHT_ENABLE() backlightEnable()
#define BACKLIGHT_DISABLE() backlightDisable()

View file

@ -352,7 +352,7 @@ void backlightEnable(uint8_t dutyCycle);
#endif
#define BACKLIGHT_ENABLE() backlightEnable(UNEXPECTED_SHUTDOWN() ? 100 : 100-g_eeGeneral.backlightBright)
#define BACKLIGHT_DISABLE() backlightEnable(UNEXPECTED_SHUTDOWN() ? 100 : g_eeGeneral.blOffBright)
#define isBacklightEnable() true
#define isBacklightEnabled() true
// USB driver
int usbPlugged(void);

View file

@ -78,7 +78,7 @@ void boardInit(void);
// Backlight driver
#define backlightEnable() PORTC |= (1<<OUT_C_LIGHT)
#define backlightDisable() PORTC &= ~(1<<OUT_C_LIGHT)
#define isBacklightEnable() PORTC & (1<<OUT_C_LIGHT)
#define isBacklightEnabled() PORTC & (1<<OUT_C_LIGHT)
#define BACKLIGHT_ENABLE() backlightEnable()
#define BACKLIGHT_DISABLE() backlightDisable()

View file

@ -279,7 +279,7 @@ extern "C" {
// Backlight driver
#define backlightEnable() (PWM->PWM_CH_NUM[0].PWM_CDTY = g_eeGeneral.backlightBright)
#define backlightDisable() (PWM->PWM_CH_NUM[0].PWM_CDTY = 100)
#define isBacklightEnable() (PWM->PWM_CH_NUM[0].PWM_CDTY != 100)
#define isBacklightEnabled() (PWM->PWM_CH_NUM[0].PWM_CDTY != 100)
#define BACKLIGHT_ENABLE() backlightEnable()
#define BACKLIGHT_DISABLE() backlightDisable()

View file

@ -54,7 +54,7 @@ void backlightDisable()
BACKLIGHT_TIMER->CCR2 = 0;
}
uint8_t isBacklightEnable()
uint8_t isBacklightEnabled()
{
return (BACKLIGHT_TIMER->CCR1 != 0 || BACKLIGHT_TIMER->CCR2 != 0);
}
@ -93,7 +93,7 @@ void backlightDisable()
BACKLIGHT_TIMER->CCR2 = 0;
}
uint8_t isBacklightEnable()
uint8_t isBacklightEnabled()
{
return (BACKLIGHT_TIMER->CCR4 != 0 || BACKLIGHT_TIMER->CCR2 != 0);
}
@ -127,7 +127,7 @@ void backlightDisable()
BACKLIGHT_TIMER->CCR2 = 0;
}
uint8_t isBacklightEnable()
uint8_t isBacklightEnabled()
{
return BACKLIGHT_TIMER->CCR2 != 0;
}
@ -161,7 +161,7 @@ void backlightDisable()
BACKLIGHT_TIMER->CCR1 = 0;
}
uint8_t isBacklightEnable()
uint8_t isBacklightEnabled()
{
return BACKLIGHT_TIMER->CCR1 != 0;
}

View file

@ -404,7 +404,7 @@ uint32_t pwroffPressed(void);
void backlightInit(void);
void backlightDisable(void);
#define BACKLIGHT_DISABLE() backlightDisable()
uint8_t isBacklightEnable(void);
uint8_t isBacklightEnabled(void);
#if defined(PCBX9E) || defined(PCBX9DP)
void backlightEnable(uint8_t level, uint8_t color);
#define BACKLIGHT_ENABLE() backlightEnable(g_eeGeneral.backlightBright, g_eeGeneral.backlightColor)