fix(color): screen refresh may be slower on some radios after update to LVGL 8.4 (#6349)
This commit is contained in:
@@ -25,6 +25,35 @@
|
||||
#include "libopenui_defines.h"
|
||||
#include "dma2d.h"
|
||||
|
||||
#if !LV_USE_GPU_STM32_DMA2D
|
||||
/**
|
||||
* Turn on the peripheral and set output color mode, this only needs to be done once
|
||||
*
|
||||
* Copied from LVGL code
|
||||
*/
|
||||
void DMAInit(void)
|
||||
{
|
||||
// Enable DMA2D clock
|
||||
#if defined(STM32F4) || defined(STM32F7) || defined(STM32U5)
|
||||
RCC->AHB1ENR |= RCC_AHB1ENR_DMA2DEN; // enable DMA2D
|
||||
// wait for hardware access to complete
|
||||
__asm volatile("DSB\n");
|
||||
volatile uint32_t temp = RCC->AHB1ENR;
|
||||
LV_UNUSED(temp);
|
||||
#elif defined(STM32H7)
|
||||
RCC->AHB3ENR |= RCC_AHB3ENR_DMA2DEN;
|
||||
// wait for hardware access to complete
|
||||
__asm volatile("DSB\n");
|
||||
volatile uint32_t temp = RCC->AHB3ENR;
|
||||
LV_UNUSED(temp);
|
||||
#else
|
||||
# warning "LVGL can't enable the clock of DMA2D"
|
||||
#endif
|
||||
// AHB master timer configuration
|
||||
DMA2D->AMTCR = 0; // AHB bus guaranteed dead time disabled
|
||||
}
|
||||
#endif
|
||||
|
||||
void DMACopyBitmap(uint16_t *dest, uint16_t destw, uint16_t desth, uint16_t x,
|
||||
uint16_t y, const uint16_t *src, uint16_t srcw,
|
||||
uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w,
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
#include "edgetx_types.h"
|
||||
|
||||
#if !defined(SIMU)
|
||||
#if !defined(SIMU) && !defined(BOOT)
|
||||
static inline void DMAWait()
|
||||
{
|
||||
while(DMA2D->CR & DMA2D_CR_START);
|
||||
@@ -32,6 +32,7 @@ static inline void DMAWait()
|
||||
static inline void DMAWait() {}
|
||||
#endif
|
||||
|
||||
void DMAInit();
|
||||
void DMAFillRect(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t color);
|
||||
void DMACopyBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, const uint16_t * src, uint16_t srcw, uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w, uint16_t h);
|
||||
void DMACopyAlphaBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, const uint16_t * src, uint16_t srcw, uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w, uint16_t h);
|
||||
|
||||
@@ -234,14 +234,6 @@ void boardInit()
|
||||
#else
|
||||
ledGreen();
|
||||
#endif
|
||||
|
||||
#if !defined(LCD_VERTICAL_INVERT)
|
||||
lcdSetInitalFrameBuffer(lcdFront->getData());
|
||||
#elif defined(RADIO_F16)
|
||||
if(hardwareOptions.pcbrev > 0) {
|
||||
lcdSetInitalFrameBuffer(lcdFront->getData());
|
||||
}
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -218,8 +218,6 @@ void boardInit()
|
||||
#if defined(RTCLOCK)
|
||||
rtcInit(); // RTC must be initialized before rambackupRestore() is called
|
||||
#endif
|
||||
|
||||
lcdSetInitalFrameBuffer(lcdFront->getData());
|
||||
}
|
||||
|
||||
extern void rtcDisableBackupReg();
|
||||
|
||||
@@ -315,47 +315,75 @@ void ledChargingInfo(uint16_t chargeState) {
|
||||
#endif
|
||||
}
|
||||
|
||||
static Window* chargeWindow = nullptr;
|
||||
|
||||
void drawChargingInfo(uint16_t chargeState) {
|
||||
static int progress = 0;
|
||||
const char* text = chargeState == CHARGE_STARTED ? STR_BATTERYCHARGING : STR_BATTERYFULL;
|
||||
int h = 0;
|
||||
LcdFlags color = 0;
|
||||
if (CHARGE_STARTED == chargeState)
|
||||
{
|
||||
if (progress >= 100)
|
||||
{
|
||||
progress = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
progress += 25;
|
||||
}
|
||||
text = STR_BATTERYCHARGING;
|
||||
h = ((BATTERY_H_INNER * progress) / 100);
|
||||
color = COLOR_THEME_EDIT;
|
||||
static int progress = -1;
|
||||
static StaticText* stateText = nullptr;
|
||||
static lv_obj_t* battBox = nullptr;
|
||||
|
||||
const char* text;
|
||||
int h;
|
||||
LcdColorIndex color = COLOR_THEME_EDIT_INDEX;
|
||||
|
||||
switch (chargeState) {
|
||||
case CHARGE_STARTED:
|
||||
progress += 1;
|
||||
if (progress > 4) progress = 0;
|
||||
text = STR_BATTERYCHARGING;
|
||||
h = ((BATTERY_H_INNER * progress) / 4);
|
||||
break;
|
||||
case CHARGE_FINISHED:
|
||||
text = STR_BATTERYFULL;
|
||||
h = BATTERY_H_INNER;
|
||||
break;
|
||||
default:
|
||||
text = STR_BATTERYNONE;
|
||||
h = BATTERY_H_INNER;
|
||||
color = COLOR_THEME_PRIMARY1_INDEX;
|
||||
break;
|
||||
}
|
||||
else if (CHARGE_FINISHED == chargeState)
|
||||
{
|
||||
text = STR_BATTERYFULL;
|
||||
h = BATTERY_H_INNER;
|
||||
color = COLOR_THEME_EDIT;
|
||||
}
|
||||
else
|
||||
{
|
||||
text = STR_BATTERYNONE;
|
||||
h = BATTERY_H_INNER;
|
||||
color = COLOR_THEME_PRIMARY1;
|
||||
|
||||
if (chargeWindow == nullptr) {
|
||||
chargeWindow = new Window(MainWindow::instance(), {0, 0, LCD_W, LCD_H});
|
||||
etx_solid_bg(chargeWindow->getLvObj(), COLOR_THEME_PRIMARY1_INDEX);
|
||||
|
||||
stateText = new StaticText(chargeWindow, {0, LCD_H - 50, LCD_W, 50}, "", COLOR_THEME_PRIMARY2_INDEX, CENTERED);
|
||||
|
||||
lv_obj_t* box = lv_obj_create(chargeWindow->getLvObj());
|
||||
lv_obj_set_pos(box, (LCD_W - BATTERY_W) / 2, BATTERY_TOP);
|
||||
lv_obj_set_size(box, BATTERY_W, BATTERY_H);
|
||||
lv_obj_set_style_border_opa(box, LV_OPA_COVER, LV_PART_MAIN);
|
||||
lv_obj_set_style_border_width(box, 2, LV_PART_MAIN);
|
||||
etx_border_color(box, COLOR_THEME_PRIMARY2_INDEX);
|
||||
|
||||
box = lv_obj_create(chargeWindow->getLvObj());
|
||||
lv_obj_set_pos(box, (LCD_W - BATTERY_CONNECTOR_W) / 2, BATTERY_TOP - BATTERY_CONNECTOR_H);
|
||||
lv_obj_set_size(box, BATTERY_CONNECTOR_W, BATTERY_CONNECTOR_H);
|
||||
etx_solid_bg(box, COLOR_THEME_PRIMARY2_INDEX);
|
||||
|
||||
battBox = lv_obj_create(chargeWindow->getLvObj());
|
||||
}
|
||||
|
||||
stateText->setText(text);
|
||||
|
||||
lv_obj_set_pos(battBox, (LCD_W - BATTERY_W_INNER) / 2, BATTERY_TOP_INNER + BATTERY_H_INNER - h);
|
||||
lv_obj_set_size(battBox, BATTERY_W_INNER, h);
|
||||
etx_solid_bg(battBox, color);
|
||||
|
||||
LvglWrapper::instance()->run();
|
||||
lv_refr_now(nullptr);
|
||||
|
||||
BACKLIGHT_ENABLE();
|
||||
lcd->drawSizedText(LCD_W / 2, LCD_H - 50, text, strlen(text), CENTERED | COLOR_THEME_PRIMARY2);
|
||||
|
||||
lcd->drawFilledRect((LCD_W - BATTERY_W) / 2, BATTERY_TOP, BATTERY_W, BATTERY_H, SOLID, COLOR_THEME_PRIMARY2);
|
||||
lcd->drawFilledRect((LCD_W - BATTERY_W_INNER) / 2, BATTERY_TOP_INNER, BATTERY_W_INNER, BATTERY_H_INNER, SOLID, COLOR_THEME_PRIMARY1);
|
||||
|
||||
lcd->drawFilledRect((LCD_W - BATTERY_W_INNER) / 2, BATTERY_TOP_INNER + BATTERY_H_INNER - h, BATTERY_W_INNER, h, SOLID, color);
|
||||
lcd->drawFilledRect((LCD_W - BATTERY_CONNECTOR_W) / 2, BATTERY_TOP - BATTERY_CONNECTOR_H, BATTERY_CONNECTOR_W, BATTERY_CONNECTOR_H, SOLID, COLOR_THEME_PRIMARY2);
|
||||
}
|
||||
|
||||
void battery_charge_end()
|
||||
{
|
||||
chargeWindow->clear();
|
||||
delete chargeWindow;
|
||||
chargeWindow = nullptr;
|
||||
}
|
||||
|
||||
#define CHARGE_INFO_DURATION 5000 // ms
|
||||
|
||||
//this method should be called by timer interrupt or by GPIO interrupt
|
||||
@@ -385,6 +413,12 @@ void handle_battery_charge(uint32_t last_press_time)
|
||||
lastState = chargeState;
|
||||
}
|
||||
|
||||
if (!lcdInited) {
|
||||
lcdInited = true;
|
||||
backlightInit();
|
||||
lcdInitDisplayDriver();
|
||||
}
|
||||
|
||||
if (updateTime == 0 || ((timersGetMsTick() - updateTime) >= 500))
|
||||
{
|
||||
updateTime = timersGetMsTick();
|
||||
@@ -392,25 +426,17 @@ void handle_battery_charge(uint32_t last_press_time)
|
||||
|
||||
if(now > info_until) {
|
||||
info_until = 0;
|
||||
lcd->clear();
|
||||
BACKLIGHT_DISABLE();
|
||||
if(lcdInited) {
|
||||
lcdOff();
|
||||
}
|
||||
} else {
|
||||
if (!lcdInited) {
|
||||
backlightInit();
|
||||
lcdInit();
|
||||
lcdInitDisplayDriver();
|
||||
lcdInited = true;
|
||||
} else {
|
||||
if (lcdInited) {
|
||||
lcdOn();
|
||||
}
|
||||
lcdInitDirectDrawing();
|
||||
lcd->clear();
|
||||
drawChargingInfo(chargeState);
|
||||
|
||||
// DEBUG INFO
|
||||
// DEBUG INFO - TODO delete or replace with LVGL objects
|
||||
#if 0
|
||||
char buffer[1024];
|
||||
|
||||
@@ -431,8 +457,6 @@ void handle_battery_charge(uint32_t last_press_time)
|
||||
sprintf(buffer, "%d", isChargerActive());
|
||||
lcd->drawSizedText(100, 130, buffer, strlen(buffer), CENTERED | COLOR_THEME_PRIMARY2);
|
||||
#endif
|
||||
|
||||
lcdRefresh();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -19,14 +19,7 @@
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
/***************************************************************************************************
|
||||
|
||||
***************************************************************************************************/
|
||||
#ifndef __BATTERY_DRIVER_H__
|
||||
#define __BATTERY_DRIVER_H__
|
||||
/***************************************************************************************************
|
||||
|
||||
***************************************************************************************************/
|
||||
#pragma once
|
||||
|
||||
#include "board.h"
|
||||
#include "hal.h"
|
||||
@@ -54,5 +47,4 @@ extern void handle_battery_charge(uint32_t last_press_time);
|
||||
extern uint16_t get_battery_charge_state();
|
||||
extern uint16_t getBatteryVoltage(); // returns current battery voltage in 10mV steps
|
||||
extern bool isChargerActive();
|
||||
|
||||
#endif
|
||||
extern void battery_charge_end();
|
||||
|
||||
@@ -260,6 +260,7 @@ void boardInit()
|
||||
press_end = 0;
|
||||
}
|
||||
}
|
||||
battery_charge_end();
|
||||
}
|
||||
|
||||
keysInit();
|
||||
@@ -287,8 +288,6 @@ void boardInit()
|
||||
ledGreen();
|
||||
#endif
|
||||
#endif
|
||||
|
||||
lcdSetInitalFrameBuffer(lcdFront->getData());
|
||||
}
|
||||
|
||||
extern void rtcDisableBackupReg();
|
||||
|
||||
@@ -230,47 +230,75 @@ void ledChargingInfo(uint16_t chargeState) {
|
||||
#endif
|
||||
}
|
||||
|
||||
static Window* chargeWindow = nullptr;
|
||||
|
||||
void drawChargingInfo(uint16_t chargeState) {
|
||||
static int progress = 0;
|
||||
const char* text = chargeState == CHARGE_STARTED ? STR_BATTERYCHARGING : STR_BATTERYFULL;
|
||||
int h = 0;
|
||||
LcdFlags color = 0;
|
||||
if (CHARGE_STARTED == chargeState)
|
||||
{
|
||||
if (progress >= 100)
|
||||
{
|
||||
progress = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
progress += 25;
|
||||
}
|
||||
text = STR_BATTERYCHARGING;
|
||||
h = ((BATTERY_H_INNER * progress) / 100);
|
||||
color = COLOR_THEME_EDIT;
|
||||
static int progress = -1;
|
||||
static StaticText* stateText = nullptr;
|
||||
static lv_obj_t* battBox = nullptr;
|
||||
|
||||
const char* text;
|
||||
int h;
|
||||
LcdColorIndex color = COLOR_THEME_EDIT_INDEX;
|
||||
|
||||
switch (chargeState) {
|
||||
case CHARGE_STARTED:
|
||||
progress += 1;
|
||||
if (progress > 4) progress = 0;
|
||||
text = STR_BATTERYCHARGING;
|
||||
h = ((BATTERY_H_INNER * progress) / 4);
|
||||
break;
|
||||
case CHARGE_FINISHED:
|
||||
text = STR_BATTERYFULL;
|
||||
h = BATTERY_H_INNER;
|
||||
break;
|
||||
default:
|
||||
text = STR_BATTERYNONE;
|
||||
h = BATTERY_H_INNER;
|
||||
color = COLOR_THEME_PRIMARY1_INDEX;
|
||||
break;
|
||||
}
|
||||
else if (CHARGE_FINISHED == chargeState)
|
||||
{
|
||||
text = STR_BATTERYFULL;
|
||||
h = BATTERY_H_INNER;
|
||||
color = COLOR_THEME_EDIT;
|
||||
}
|
||||
else
|
||||
{
|
||||
text = STR_BATTERYNONE;
|
||||
h = BATTERY_H_INNER;
|
||||
color = COLOR_THEME_PRIMARY1;
|
||||
|
||||
if (chargeWindow == nullptr) {
|
||||
chargeWindow = new Window(MainWindow::instance(), {0, 0, LCD_W, LCD_H});
|
||||
etx_solid_bg(chargeWindow->getLvObj(), COLOR_THEME_PRIMARY1_INDEX);
|
||||
|
||||
stateText = new StaticText(chargeWindow, {0, LCD_H - 50, LCD_W, 50}, "", COLOR_THEME_PRIMARY2_INDEX, CENTERED);
|
||||
|
||||
lv_obj_t* box = lv_obj_create(chargeWindow->getLvObj());
|
||||
lv_obj_set_pos(box, (LCD_W - BATTERY_W) / 2, BATTERY_TOP);
|
||||
lv_obj_set_size(box, BATTERY_W, BATTERY_H);
|
||||
lv_obj_set_style_border_opa(box, LV_OPA_COVER, LV_PART_MAIN);
|
||||
lv_obj_set_style_border_width(box, 2, LV_PART_MAIN);
|
||||
etx_border_color(box, COLOR_THEME_PRIMARY2_INDEX);
|
||||
|
||||
box = lv_obj_create(chargeWindow->getLvObj());
|
||||
lv_obj_set_pos(box, (LCD_W - BATTERY_CONNECTOR_W) / 2, BATTERY_TOP - BATTERY_CONNECTOR_H);
|
||||
lv_obj_set_size(box, BATTERY_CONNECTOR_W, BATTERY_CONNECTOR_H);
|
||||
etx_solid_bg(box, COLOR_THEME_PRIMARY2_INDEX);
|
||||
|
||||
battBox = lv_obj_create(chargeWindow->getLvObj());
|
||||
}
|
||||
|
||||
stateText->setText(text);
|
||||
|
||||
lv_obj_set_pos(battBox, (LCD_W - BATTERY_W_INNER) / 2, BATTERY_TOP_INNER + BATTERY_H_INNER - h);
|
||||
lv_obj_set_size(battBox, BATTERY_W_INNER, h);
|
||||
etx_solid_bg(battBox, color);
|
||||
|
||||
LvglWrapper::instance()->run();
|
||||
lv_refr_now(nullptr);
|
||||
|
||||
BACKLIGHT_ENABLE();
|
||||
lcd->drawSizedText(LCD_W / 2, LCD_H - 50, text, strlen(text), CENTERED | COLOR_THEME_PRIMARY2);
|
||||
|
||||
lcd->drawFilledRect((LCD_W - BATTERY_W) / 2, BATTERY_TOP, BATTERY_W, BATTERY_H, SOLID, COLOR_THEME_PRIMARY2);
|
||||
lcd->drawFilledRect((LCD_W - BATTERY_W_INNER) / 2, BATTERY_TOP_INNER, BATTERY_W_INNER, BATTERY_H_INNER, SOLID, COLOR_THEME_PRIMARY1);
|
||||
|
||||
lcd->drawFilledRect((LCD_W - BATTERY_W_INNER) / 2, BATTERY_TOP_INNER + BATTERY_H_INNER - h, BATTERY_W_INNER, h, SOLID, color);
|
||||
lcd->drawFilledRect((LCD_W - BATTERY_CONNECTOR_W) / 2, BATTERY_TOP - BATTERY_CONNECTOR_H, BATTERY_CONNECTOR_W, BATTERY_CONNECTOR_H, SOLID, COLOR_THEME_PRIMARY2);
|
||||
}
|
||||
|
||||
void battery_charge_end()
|
||||
{
|
||||
chargeWindow->clear();
|
||||
delete chargeWindow;
|
||||
chargeWindow = nullptr;
|
||||
}
|
||||
|
||||
#define CHARGE_INFO_DURATION 5000 // ms
|
||||
|
||||
//this method should be called by timer interrupt or by GPIO interrupt
|
||||
@@ -300,6 +328,12 @@ void handle_battery_charge(uint32_t last_press_time)
|
||||
lastState = chargeState;
|
||||
}
|
||||
|
||||
if (!lcdInited) {
|
||||
lcdInited = true;
|
||||
backlightInit();
|
||||
lcdInitDisplayDriver();
|
||||
}
|
||||
|
||||
if (updateTime == 0 || ((timersGetMsTick() - updateTime) >= 500))
|
||||
{
|
||||
updateTime = timersGetMsTick();
|
||||
@@ -307,25 +341,17 @@ void handle_battery_charge(uint32_t last_press_time)
|
||||
|
||||
if(now > info_until) {
|
||||
info_until = 0;
|
||||
lcd->clear();
|
||||
BACKLIGHT_DISABLE();
|
||||
if(lcdInited) {
|
||||
lcdOff();
|
||||
}
|
||||
} else {
|
||||
if (!lcdInited) {
|
||||
backlightInit();
|
||||
lcdInit();
|
||||
lcdInitDisplayDriver();
|
||||
lcdInited = true;
|
||||
} else {
|
||||
if (lcdInited) {
|
||||
lcdOn();
|
||||
}
|
||||
lcdInitDirectDrawing();
|
||||
lcd->clear();
|
||||
drawChargingInfo(chargeState);
|
||||
|
||||
// DEBUG INFO
|
||||
// DEBUG INFO - TODO delete or replace with LVGL objects
|
||||
#if 0
|
||||
char buffer[1024];
|
||||
|
||||
@@ -338,8 +364,6 @@ void handle_battery_charge(uint32_t last_press_time)
|
||||
sprintf(buffer, "%d", isChargerActive());
|
||||
lcd->drawSizedText(100, 130, buffer, strlen(buffer), CENTERED | COLOR_THEME_PRIMARY2);
|
||||
#endif
|
||||
|
||||
lcdRefresh();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -19,14 +19,7 @@
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
/***************************************************************************************************
|
||||
|
||||
***************************************************************************************************/
|
||||
#ifndef __BATTERY_DRIVER_H__
|
||||
#define __BATTERY_DRIVER_H__
|
||||
/***************************************************************************************************
|
||||
|
||||
***************************************************************************************************/
|
||||
#pragma once
|
||||
|
||||
#include "board.h"
|
||||
#include "hal.h"
|
||||
@@ -47,5 +40,4 @@ extern void handle_battery_charge(uint32_t last_press_time);
|
||||
extern uint16_t get_battery_charge_state();
|
||||
extern uint16_t getBatteryVoltage(); // returns current battery voltage in 10mV steps
|
||||
extern bool isChargerActive();
|
||||
|
||||
#endif
|
||||
extern void battery_charge_end();
|
||||
|
||||
@@ -233,6 +233,8 @@ void boardInit()
|
||||
boardOff();
|
||||
} else {
|
||||
uint32_t press_end_touch = press_end;
|
||||
extern void rotaryEncoderCheck();
|
||||
rotaryEncoderCheck();
|
||||
rotenc_t value = rotaryEncoderGetValue();
|
||||
if (value != lastEncoderValue) {
|
||||
lastEncoderValue = value;
|
||||
@@ -244,6 +246,7 @@ void boardInit()
|
||||
press_end = 0;
|
||||
}
|
||||
}
|
||||
battery_charge_end();
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -259,8 +262,6 @@ void boardInit()
|
||||
#if defined(RTCLOCK)
|
||||
rtcInit(); // RTC must be initialized before rambackupRestore() is called
|
||||
#endif
|
||||
|
||||
lcdSetInitalFrameBuffer(lcdFront->getData());
|
||||
}
|
||||
|
||||
extern void rtcDisableBackupReg();
|
||||
|
||||
@@ -126,7 +126,6 @@ void boardInit()
|
||||
|
||||
delay_ms(50); // GT911 is a bit slow on power ON
|
||||
touchPanelInit();
|
||||
lcdSetInitalFrameBuffer(lcdFront->getData());
|
||||
}
|
||||
|
||||
extern void rtcDisableBackupReg();
|
||||
|
||||
Reference in New Issue
Block a user